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

[Thomas Draier]

tdraier     2005/11/07 12:05:56 CET

  Modified files:
    core/src/java/org/jahia/services/importexport 
                                                  ImportExportBaseService.java 
  Log:
  fix file acl export
  
  Revision  Changes    Path
  1.42      +6 -4      
jahia/core/src/java/org/jahia/services/importexport/ImportExportBaseService.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/importexport/ImportExportBaseService.java.diff?r1=1.41&r2=1.42&f=h
  
  
  
  Index: ImportExportBaseService.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/services/importexport/ImportExportBaseService.java,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- ImportExportBaseService.java      3 Nov 2005 17:08:39 -0000       1.41
  +++ ImportExportBaseService.java      7 Nov 2005 11:05:56 -0000       1.42
  @@ -770,10 +770,12 @@
               String perms = "";
               for (Iterator iterator1 = users.iterator(); 
iterator1.hasNext();) {
                   String s1 = (String) iterator1.next();
  -                perms += "|" + s1 + ":" +
  -                        (((((Integer)read.get(s1)).intValue() & 
DAVFileAccess.GRANTED)==0)?'-':'r') +
  -                        (((((Integer)write.get(s1)).intValue() & 
DAVFileAccess.GRANTED)==0)?'-':'w') +
  -                        (((((Integer)admin.get(s1)).intValue() & 
DAVFileAccess.GRANTED)==0)?'-':'a');
  +                if (s1 != null && s1.length()>0) {
  +                    perms += "|" + s1 + ":" +
  +                            (((((Integer)read.get(s1)).intValue() & 
DAVFileAccess.GRANTED)==0)?'-':'r') +
  +                            (((((Integer)write.get(s1)).intValue() & 
DAVFileAccess.GRANTED)==0)?'-':'w') +
  +                            (((((Integer)admin.get(s1)).intValue() & 
DAVFileAccess.GRANTED)==0)?'-':'a');
  +                }
               }
               if (perms.length() > 0) {
                   perms = perms.substring(1);