The checkin from SALOME operation is updated (ScenarioService.checkin()). Versioning...

[tools/siman.git] / Workspace / Siman-Common / src / org / splat / service / PublicationServiceImpl.java

diff --git a/Workspace/Siman-Common/src/org/splat/service/PublicationServiceImpl.java b/Workspace/Siman-Common/src/org/splat/service/PublicationServiceImpl.java
index 9e3a570afcbc01de09d022814d8408df5e009a1d..a47e1dc7ed43d554a45a61d0538399dbd81e8974 100644 (file)
--- a/Workspace/Siman-Common/src/org/splat/service/PublicationServiceImpl.java
+++ b/Workspace/Siman-Common/src/org/splat/service/PublicationServiceImpl.java
@@ -450,11 +450,12 @@ public class PublicationServiceImpl implements PublicationService {
                if (previous != null) {
                        Publication oldoc = step.getDocument(previous.getIndex());
                        boolean done = getStepService().remove(step, oldoc); // Decrements the configuration tag count of document
-                       if (done) {
+/*                     if (done) {
                                oldoc = getPublicationDAO().merge(oldoc); //RKV: to avoid: NonUniqueObjectException: a different object with the same identifier value was already associated with the session
-                               getPublicationDAO().delete(oldoc); // WARNING: Potential problem because it's not automatically done as orphan object
+                               //RKV: use delete-orphan by removing from project element, see StepService.remove
+                               //RKV: getPublicationDAO().delete(oldoc); // WARNING: Potential problem because it's not automatically done as orphan object
                        }
-               }
+*/             }
                getStepService().add(step, aPublication); // Increments the configuration tag count of document
 
                // Import the document properties and update of the study