From 57c7d6dc385486e3d7362394d703793de7c95cbd Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Fri, 16 Oct 2015 13:15:53 +0200 Subject: [PATCH] =?utf8?q?added=20missing=20cascade=20type,=20at=20least?= =?utf8?q?=20MERGE=20+=20updated=20jar(s)=20Signed-off-by:Roland=20H=C3=A4?= =?utf8?q?der=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- lib/jphone-core.jar | Bin 22744 -> 23037 bytes .../jcontacts/contact/UserContact.java | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jphone-core.jar b/lib/jphone-core.jar index 81ca4755ccdf292544af3d629e16f170e56d27f1..eec6972ea0bf3abb4183919486c5384cd4c89967 100644 GIT binary patch literal 23037 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 diff --git a/src/org/mxchange/jcontacts/contact/UserContact.java b/src/org/mxchange/jcontacts/contact/UserContact.java index 8ab889c..ae03a05 100644 --- a/src/org/mxchange/jcontacts/contact/UserContact.java +++ b/src/org/mxchange/jcontacts/contact/UserContact.java @@ -114,7 +114,7 @@ public class UserContact implements Contact, Comparable { * Country code */ @JoinColumn (name = "contact_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 contactCountry; /** -- 2.39.5