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

[Thomas Draier]

tdraier     2005/11/02 17:54:38 CET

  Modified files:
    core/src/java/org/jahia/services/importexport 
                                                  ImportHandler.java 
  Log:
  check if acl not null
  
  Revision  Changes    Path
  1.36      +1 -1      
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.35&r2=1.36&f=h
  
  
  
  Index: ImportHandler.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/services/importexport/ImportHandler.java,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- ImportHandler.java        28 Oct 2005 10:08:27 -0000      1.35
  +++ ImportHandler.java        2 Nov 2005 16:54:38 -0000       1.36
  @@ -308,7 +308,7 @@
           lastObject = (ContentObject) objects.pop();
           logger.info("End element {" + namespaceURI + "}" +localName + " = 
"+lastObject);
   
  -        if (lastObject == topObjectWithAclChanged) {
  +        if (lastObject == topObjectWithAclChanged && topAcl != null) {
               fillAcl(topObjectWithAclChanged.getACL(), topAcl);
           }
       }