From 576f7a50b1209258716d7722702980feaa525b9c Mon Sep 17 00:00:00 2001
From: rkv <rkv@opencascade.com>
Date: Mon, 18 Mar 2013 11:05:12 +0000
Subject: [PATCH] No need in merging user by cascade from ConributorRelation.

---
 .../Siman-Common/src/org/splat/dal/bo/som/Relations.hbm.xml | 6 ++++--
 .../src/test/splat/service/TestStudyService.java            | 6 ++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Workspace/Siman-Common/src/org/splat/dal/bo/som/Relations.hbm.xml b/Workspace/Siman-Common/src/org/splat/dal/bo/som/Relations.hbm.xml
index 9a42aa9..9d07158 100644
--- a/Workspace/Siman-Common/src/org/splat/dal/bo/som/Relations.hbm.xml
+++ b/Workspace/Siman-Common/src/org/splat/dal/bo/som/Relations.hbm.xml
@@ -37,14 +37,16 @@
 <!-- Contributor actor relation: Study to User
   -->
     <union-subclass name="org.splat.dal.bo.som.ContributorRelation" extends="org.splat.dal.bo.kernel.Relation" table="contributor_rel">
-        <many-to-one cascade="merge" name="refer" column="refer" access="field" not-null="true" />
+        <many-to-one name="refer" column="refer" access="field" not-null="true" />
+<!--         <many-to-one cascade="all-delete-orphan" unique="true" name="refer" column="refer" access="field" not-null="true" />
+ -->
     </union-subclass>
 
 <!-- ValidationCycle relation: Study to ValidationCycle
   -->
     <union-subclass name="org.splat.dal.bo.som.ValidationCycleRelation" extends="org.splat.dal.bo.kernel.Relation" table="cycle_rel">
         <many-to-one name="refer" column="refer" unique="true" cascade="all-delete-orphan" access="field" not-null="true" />
-		<!-- <many-to-one cascade="merge" name="refer" column="refer" unique="true" access="field" not-null="true" />-->
+		<!-- <many-to-one name="refer" column="refer" unique="true" access="field" not-null="true" />-->
     </union-subclass>
 
 <!-- Stamp relation: Document to Timestamp
diff --git a/Workspace/Siman-Common/src/test/splat/service/TestStudyService.java b/Workspace/Siman-Common/src/test/splat/service/TestStudyService.java
index dc2e303..3776ef1 100644
--- a/Workspace/Siman-Common/src/test/splat/service/TestStudyService.java
+++ b/Workspace/Siman-Common/src/test/splat/service/TestStudyService.java
@@ -827,6 +827,12 @@ public class TestStudyService extends BaseTest {
 
 		// /////////////////////////////////////////////////////////
 		ht.clear();
+		// Check removal of contributors relation
+		List found1 = ht.find("from ContributorRelation where owner=" + studyId);
+		Assert.assertEquals(found1.size(), 1,
+				"ContributorRelation is not created");
+		ht.clear();
+		
 		_studyService.removeStudy(studyId);
 		ht.flush();
 
-- 
2.39.2