From 280ca596c1e8f89de4d1efbf2945e795da989823 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Fri, 23 Oct 2015 17:57:20 +0200
Subject: [PATCH] Only merge + updated jar(s)

---
 lib/jphone-core.jar                           | Bin 25387 -> 25391 bytes
 .../branch/CompanyBranchOffice.java           |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/jphone-core.jar b/lib/jphone-core.jar
index c9c4898c3257f4944495f830d079c3f386a3af3a..abcb50e97ca270b6b4dfcbc96cab818820636243 100644
GIT binary patch
delta 239
zcmZ2|jB))jMxFp~W)?061`Y-WtNw{RnoO4c8_i!aGFkOcR%UVoQk%1x%5{0I`orB@
zO_wiJ5M*Fb*!*7q7xQFY#p|2*natx60?B#(>$STJlmlTGhRKO>`kUuE27(k>Y*uld
zCk8U_NVFx;^v(aHA;!Os4FehP9H+~SYW(Ed#CQcvLmA*;Nn?m3$co8x9mOZFOA?qI
ilqAJ8IT$STz=M18iX;Q3$6-LO*yImMrfj>SK{^2jXHA0u

delta 242
zcmZ2~jB)ibMxFp~W)?061`Y;>mt7NiG?`v>Z8U$yIPs^zWJ4y4$@drqHdiub>hiwm
z3U^<{A>=71$iN`C`Mv%xW)@~gAD_+djq`bhK$61iwOnokB|+GQVRB-u@?-}tp3U<e
z10gCWzc)78tl>IOjOk_9<P*`BK#Mjr$Gl>kJS$dU^50kw5WP7xPM&#kKs*a4+^Wfq
xiSZy28C3Hb;9yB(kR!~t$@)o-jQx`fld_rahXDn}Cf{M=nUt)_wk;Z@9sqzCOXdIo

diff --git a/src/org/mxchange/jcontactsbusiness/branch/CompanyBranchOffice.java b/src/org/mxchange/jcontactsbusiness/branch/CompanyBranchOffice.java
index 4ea7344..f01d55e 100644
--- a/src/org/mxchange/jcontactsbusiness/branch/CompanyBranchOffice.java
+++ b/src/org/mxchange/jcontactsbusiness/branch/CompanyBranchOffice.java
@@ -73,7 +73,7 @@ public class CompanyBranchOffice implements BranchOffice, Comparable<BranchOffic
 	 * Branch office's country code
 	 */
 	@JoinColumn (name = "branch_country_id", nullable = false)
-	@OneToOne (targetEntity = CountryData.class, optional = false, fetch = FetchType.EAGER)
+	@OneToOne (targetEntity = CountryData.class, cascade = CascadeType.MERGE, optional = false, fetch = FetchType.EAGER)
 	private Country branchCountry;
 
 	/**
-- 
2.39.5