/ - Diff - EDIT - EDIT Project Management

« Previous | Next »

Revision b5e66a5b

Fix session problems #5592

     	public void addPages() {
     		CdmFormFactory formFactory = selectionElement.getFormFactory();
     		CdmBase entity = (CdmBase) HibernateProxyHelper
     		CdmBase entity = HibernateProxyHelper
     				.deproxy(selectionElement.getEntity());
     		//check if entity has already been persisted
     		if(entity.getId()==0){
     			rootElement = entity;
     			cdmEntitySession.addNewCdmEntity(rootElement);
+    		}
     		else{
     			IService<CdmBase> service = CdmStore.getService(entity);
-...
     	@Override
     	public boolean performFinish() {
     	    IService<CdmBase> service = CdmStore.getService(rootElement);
     	    service.merge(rootElement, true);
     	    if(rootElement.getId()!=0){
     	        service.merge(rootElement, true);
+    	    }
     	    if(previousCdmEntitySession!=null){
     	    	previousCdmEntitySession.load(rootElement, true);
     	        selectionElement.setEntity(previousCdmEntitySession.load(rootElement, true));
+    	    }
     		return true;
+    	}
-...
                 cdmEntitySession.dispose();
+            }
             if(previousCdmEntitySession!=null){
                 previousCdmEntitySession.bind();
                 previousCdmEntitySession.dispose();
+            }
+        }

Also available in: Unified diff