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

[Thomas Draier]

tdraier     2005/11/07 11:41:54 CET

  Modified files:
    core/src/java/org/jahia/services/importexport 
                                                  ImportHandler.java 
  Log:
  fix acl when importing
  
  Revision  Changes    Path
  1.39      +7 -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.38&r2=1.39&f=h
  
  
  
  Index: ImportHandler.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/services/importexport/ImportHandler.java,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- ImportHandler.java        3 Nov 2005 13:22:27 -0000       1.38
  +++ ImportHandler.java        7 Nov 2005 10:41:53 -0000       1.39
  @@ -310,7 +310,13 @@
           logger.info("End element {" + namespaceURI + "}" +localName + " = 
"+lastObject);
   
           if (lastObject == topObjectWithAclChanged && topAcl != null) {
  -            fillAcl(topObjectWithAclChanged.getACL(), topAcl);
  +            JahiaBaseACL acl = topObjectWithAclChanged.getACL();
  +            try {
  +                acl.setInheritance(0);
  +                fillAcl(acl, topAcl);
  +            } catch (JahiaACLException e) {
  +                logger.error ("Cannot set user or group ACL entry !!", e);
  +            }
           }
       }