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

[Thomas Draier]

tdraier     2005/11/03 18:11:08 CET

  Modified files:
    core/src/java/org/jahia/engines/addcontainer 
                                                 AddContainer_Engine.java 
  Log:
  release lock after import/pick
  
  Revision  Changes    Path
  1.35      +10 -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.34&r2=1.35&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.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- AddContainer_Engine.java  24 Oct 2005 16:17:43 -0000      1.34
  +++ AddContainer_Engine.java  3 Nov 2005 17:11:08 -0000       1.35
  @@ -532,12 +532,22 @@
                   JahiaContainerList list = ensureContainerList(theContainer, 
engineMap, jParams);
                   if (ManageContentPicker.getInstance().handleActions(jParams, 
JahiaEngine.SAVE_MODE,
                                                                       
engineMap, list.getContentContainerList())) {
  +                    // #ifdef LOCK
  +                    if (jParams.settings().areLocksActivated()) {
  +                        lockRegistry.release(lockKey, user, 
user.getUserKey());
  +                    }
  +                    // #endif
                       return null;
                   }
               } else if (ProcessingContext.isMultipartRequest 
(((ParamBean)jParams).getRequest ())) {
                   JahiaContainerList list = ensureContainerList(theContainer, 
engineMap, jParams);
                   if (ManageImportExport.getInstance ().handleActions 
(jParams, JahiaEngine.SAVE_MODE,
                                                                        
engineMap,  list.getContentContainerList())) {
  +                    // #ifdef LOCK
  +                    if (jParams.settings().areLocksActivated()) {
  +                        lockRegistry.release(lockKey, user, 
user.getUserKey());
  +                    }
  +                    // #endif
                       return null;
                   }
               }