[251307] [Hibernate] Implement resources in a hierarchical structure

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

1 files changed, 7 insertions, 9 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 959e077ec1..573094e026 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
@@ -280,21 +280,19 @@ public class HibernateStoreAccessor extends StoreAccessor implements IHibernateS
 
   private CDOIDHibernate getHibernateID(CDOID id)
   {
-    CDOIDHibernate folderID = null;
     if (!CDOIDUtil.isNull(id))
     {
       if (id instanceof CDOIDHibernate)
       {
-        folderID = (CDOIDHibernate)id;
-      }
-      else
-      {
-        // TODO Can this happen? When?
-        final long longID = CDOIDUtil.getLong(id);
-        folderID = CDOIDHibernateFactoryImpl.getInstance().createCDOID(longID, CDOResourceNodeClass.NAME);
+        return (CDOIDHibernate)id;
       }
+
+      // TODO Can this happen? When?
+      final long longID = CDOIDUtil.getLong(id);
+      return CDOIDHibernateFactoryImpl.getInstance().createCDOID(longID, CDOResourceNodeClass.NAME);
     }
-    return folderID;
+
+    return null;
   }
 
   private CDOFeature getResourceNameFeature()