cvs commit: jahia/core/src/java/org/jahia/hibernate/model JahiaAcl.java

[Xavier Lawrence]

xlawrence    2005/07/04 17:17:58 CEST

  Modified files:
    core/src/java/org/jahia/hibernate/model JahiaAcl.java 
  Log:
  corrected small bug regarding groupEntries
  
  Revision  Changes    Path
  1.3       +7 -4      
jahia/core/src/java/org/jahia/hibernate/model/JahiaAcl.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/model/JahiaAcl.java.diff?r1=1.2&r2=1.3&f=h
  
  
  
  Index: JahiaAcl.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/model/JahiaAcl.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JahiaAcl.java     22 Jun 2005 12:37:33 -0000      1.2
  +++ JahiaAcl.java     4 Jul 2005 15:17:57 -0000       1.3
  @@ -574,15 +574,17 @@
       }
   
       public boolean setGroupEntry(JahiaGroup group, JahiaAclEntry entry) {
  -        JahiaAclEntry current = (JahiaAclEntry) 
userEntries.get(group.getName());
  +        JahiaAclEntry current = (JahiaAclEntry) 
groupEntries.get(group.getName());
           if (current != null) {
               current.setEntryState(entry.getEntryState());
               current.setEntryTri(entry.getEntryTri());
  +            
           } else {
               current = new JahiaAclEntry(
  -                    new JahiaAclEntryPK(this, new 
Integer(ACLInfo.GROUP_TYPE_ENTRY), group.getName()),
  +                    new JahiaAclEntryPK(this, new 
Integer(ACLInfo.GROUP_TYPE_ENTRY), 
  +                    group.getName()),
                       entry.getEntryState(), entry.getEntryTri());
  -            userEntries.put(group.getName(), current);
  +            groupEntries.put(group.getName(), current);
           }
           return true;
       }
  @@ -594,7 +596,8 @@
               current.setEntryTri(entry.getEntryTri());
           } else {
               current = new JahiaAclEntry(
  -                    new JahiaAclEntryPK(this, new 
Integer(ACLInfo.USER_TYPE_ENTRY), user.getName()),
  +                    new JahiaAclEntryPK(this, new 
Integer(ACLInfo.USER_TYPE_ENTRY), 
  +                    user.getName()),
                       entry.getEntryState(), entry.getEntryTri());
               userEntries.put(user.getName(), current);
           }