cvs commit: jahia/core/src/java/org/jahia/services/importexport ImportHandler.java

[Thomas Draier]

tdraier     2005/11/03 11:20:15 CET

  Modified files:
    core/src/java/org/jahia/services/importexport 
                                                  ImportHandler.java 
  Log:
  removed locks
  
  Revision  Changes    Path
  1.37      +15 -15    
jahia/core/src/java/org/jahia/services/importexport/ImportHandler.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/importexport/ImportHandler.java.diff?r1=1.36&r2=1.37&f=h
  
  
  
  Index: ImportHandler.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/services/importexport/ImportHandler.java,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- ImportHandler.java        2 Nov 2005 16:54:38 -0000       1.36
  +++ ImportHandler.java        3 Nov 2005 10:20:15 -0000       1.37
  @@ -102,21 +102,21 @@
           oldElr = jParams.getEntryLoadRequest();
           jParams.setEntryLoadRequest(elr);
   
  -        LockService lock = ServicesRegistry.getInstance().getLockService();
  -        if (currentObject instanceof ContentContainerList) {
  -            lockKey = LockKey.composeLockKey(LockKey.ADD_CONTAINER_TYPE, 
currentObject.getID(), ((ContentContainerList)currentObject).getPageID());
  -        } else if (currentObject instanceof ContentContainer) {
  -            lockKey = LockKey.composeLockKey(LockKey.UPDATE_CONTAINER_TYPE, 
currentObject.getID(), ((ContentContainer)currentObject).getPageID());
  -        } else if (currentObject instanceof ContentField) {
  -            lockKey = LockKey.composeLockKey(LockKey.UPDATE_FIELD_TYPE, 
currentObject.getID(), ((ContentField)currentObject).getPageID());
  -        } else if (currentObject instanceof ContentPage) {
  -            lockKey = LockKey.composeLockKey(LockKey.UPDATE_PAGE_TYPE, 
currentObject.getID(), currentObject.getID());
  -        }
  -        if (lockKey !=null ) {
  -            if (!lock.acquire(lockKey, jParams.getUser(), 
jParams.getUser().getUserKey(), 3600)) {
  -                throw new SAXException("Cannot acquire lock");
  -            }
  -        }
  +//        LockService lock = ServicesRegistry.getInstance().getLockService();
  +//        if (currentObject instanceof ContentContainerList) {
  +//            lockKey = LockKey.composeLockKey(LockKey.ADD_CONTAINER_TYPE, 
currentObject.getID(), ((ContentContainerList)currentObject).getPageID());
  +//        } else if (currentObject instanceof ContentContainer) {
  +//            lockKey = 
LockKey.composeLockKey(LockKey.UPDATE_CONTAINER_TYPE, currentObject.getID(), 
((ContentContainer)currentObject).getPageID());
  +//        } else if (currentObject instanceof ContentField) {
  +//            lockKey = LockKey.composeLockKey(LockKey.UPDATE_FIELD_TYPE, 
currentObject.getID(), ((ContentField)currentObject).getPageID());
  +//        } else if (currentObject instanceof ContentPage) {
  +//            lockKey = LockKey.composeLockKey(LockKey.UPDATE_PAGE_TYPE, 
currentObject.getID(), currentObject.getID());
  +//        }
  +//        if (lockKey !=null ) {
  +//            if (!lock.acquire(lockKey, jParams.getUser(), 
jParams.getUser().getUserKey(), 3600)) {
  +//                throw new SAXException("Cannot acquire lock");
  +//            }
  +//        }
       }
   
       public void endDocument() throws SAXException {