From: Roland Haeder <roland@mxchange.org>
Date: Fri, 16 Oct 2015 11:17:18 +0000 (+0200)
Subject: added missing cascade type, at least MERGE + updated jar(s)
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=abbcdc7834bb9926c166123af2bde49c909969c0;p=jaddressbook-share-lib.git

added missing cascade type, at least MERGE + updated jar(s)
Signed-off-by:Roland Häder <roland@mxchange.org>
---

diff --git a/lib/jcontacts-business-core.jar b/lib/jcontacts-business-core.jar
index eaef0d4..b5f18b6 100644
Binary files a/lib/jcontacts-business-core.jar and b/lib/jcontacts-business-core.jar differ
diff --git a/lib/jcontacts-core.jar b/lib/jcontacts-core.jar
index 91bd4ad..0366960 100644
Binary files a/lib/jcontacts-core.jar and b/lib/jcontacts-core.jar differ
diff --git a/lib/jphone-core.jar b/lib/jphone-core.jar
index 81ca475..eec6972 100644
Binary files a/lib/jphone-core.jar and b/lib/jphone-core.jar differ
diff --git a/lib/juser-core.jar b/lib/juser-core.jar
index c8486cf..b7c2d60 100644
Binary files a/lib/juser-core.jar and b/lib/juser-core.jar differ
diff --git a/src/org/mxchange/addressbook/model/addressbook/shared/AddressbookShare.java b/src/org/mxchange/addressbook/model/addressbook/shared/AddressbookShare.java
index 54fc811..be4b1fe 100644
--- a/src/org/mxchange/addressbook/model/addressbook/shared/AddressbookShare.java
+++ b/src/org/mxchange/addressbook/model/addressbook/shared/AddressbookShare.java
@@ -21,6 +21,7 @@ import java.util.Calendar;
 import java.util.GregorianCalendar;
 import java.util.Objects;
 import javax.persistence.Basic;
+import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -76,21 +77,21 @@ public class AddressbookShare implements ShareableAddressbook, Comparable<Sharea
 	 * Address book this share is for
 	 */
 	@JoinColumn (name = "share_addressbook_id", nullable = false, updatable = false)
-	@OneToOne (targetEntity = UserAddressbook.class, optional = false)
+	@OneToOne (targetEntity = UserAddressbook.class, cascade = CascadeType.MERGE, optional = false)
 	private Addressbook shareAddressbook;
 
 	/**
-	 * User who is giving the share (for his/her address book)
+	 * User who is owning the share
 	 */
 	@JoinColumn (name = "share_owner_id", nullable = false, updatable = false)
-	@OneToOne (targetEntity = LoginUser.class, optional = false)
+	@OneToOne (targetEntity = LoginUser.class, cascade = CascadeType.MERGE, optional = false)
 	private User shareUserOwner;
 
 	/**
 	 * User the address book is shared with
 	 */
 	@JoinColumn (name = "share_sharee_id", nullable = false, updatable = false)
-	@OneToOne (targetEntity = LoginUser.class, optional = false)
+	@OneToOne (targetEntity = LoginUser.class, cascade = CascadeType.MERGE, optional = false)
 	private User shareUserSharee;
 
 	/**