cvs commit: jahia/core/src/java/org/jahia/engines/addcontainer AddContainer_Engine.java

[Cedric Mailleux]

cmailleux    2005/09/23 15:35:33 CEST

  Modified files:
    core/src/java/org/jahia/engines/addcontainer 
                                                 AddContainer_Engine.java 
  Log:
  Ensure presence of list for locking of container list for first user
  
  Revision  Changes    Path
  1.22      +4 -0      
jahia/core/src/java/org/jahia/engines/addcontainer/AddContainer_Engine.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/engines/addcontainer/AddContainer_Engine.java.diff?r1=1.21&r2=1.22&f=h
  
  
  
  Index: AddContainer_Engine.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/addcontainer/AddContainer_Engine.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- AddContainer_Engine.java  23 Sep 2005 10:14:17 -0000      1.21
  +++ AddContainer_Engine.java  23 Sep 2005 13:35:33 -0000      1.22
  @@ -220,6 +220,9 @@
                   LockKey lockKey = LockKey.composeLockKey(LockKey.
                           ADD_CONTAINER_TYPE,
                           theContainer.getListID(), theContainer.getPageID());
  +                // We must ensure the presence of container list to put lock 
for the first time user trying to add
  +                // some content in this list
  +                ensureContainerList(theContainer, engineMap, jParams);
                   if (!lockRegistry.acquire(lockKey, jParams.getUser(),
                           jParams.getSessionID(),
                           jParams.getSessionState().
  @@ -735,6 +738,7 @@
               }
               list = new JahiaContainerList(0, 
containerParentID,theContainer.getPageID(),theContainer.getctndefid(), 0);
               jahiaContainersService.saveContainerListInfo(list, parentAclID, 
jParams);
  +            theContainer.setListID(list.getID());
           }
           return list;
       }