[249847] Store resources in a hierarchical structure

https://bugs.eclipse.org/bugs/show_bug.cgi?id=249847

1 files changed, 11 insertions, 1 deletions

diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreAccessor.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreAccessor.java
index 0aeb4a9ed0..c4cf79d6ff 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreAccessor.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreAccessor.java
@@ -346,6 +346,7 @@ public class HibernateStoreAccessor extends StoreAccessor implements IHibernateS
   @Override
   public void write(CommitContext context)
   {
+    List<InternalCDORevision> adjustRevisions = new ArrayList<InternalCDORevision>();
     HibernateThreadContext.setCommitContext(context);
     if (context.getNewPackages().length > 0)
     {
@@ -362,7 +363,9 @@ public class HibernateStoreAccessor extends StoreAccessor implements IHibernateS
       {
         if (cdoRevision instanceof InternalCDORevision)
         {
-          ((InternalCDORevision)cdoRevision).setVersion(cdoRevision.getVersion() - 1);
+          InternalCDORevision internalCDORevision = (InternalCDORevision)cdoRevision;
+          internalCDORevision.setVersion(cdoRevision.getVersion() - 1);
+          adjustRevisions.add(internalCDORevision);
         }
       }
 
@@ -436,6 +439,13 @@ public class HibernateStoreAccessor extends StoreAccessor implements IHibernateS
       OM.LOG.error(e);
       throw WrappedException.wrap(e);
     }
+    finally
+    {
+      for (InternalCDORevision cdoRevision : adjustRevisions)
+      {
+        cdoRevision.setVersion(cdoRevision.getVersion() + 1);
+      }
+    }
     context.applyIDMappings();
   }