svn commit: [jahia] r14845 - /trunk/core/src/java/org/jahia/services/acl/JahiaBaseACL.java

[xlawrence]

Author: xlawrence
Date: Fri Aug  4 17:09:24 2006
New Revision: 14845

URL: https://svndev.jahia.net/websvn/listing.php?sc=1&rev=14845&repname=jahia
Log:
avoid NPE if argument is null

Modified:
    trunk/core/src/java/org/jahia/services/acl/JahiaBaseACL.java

Modified: trunk/core/src/java/org/jahia/services/acl/JahiaBaseACL.java
URL: 
https://svndev.jahia.net/websvn/diff.php?path=/trunk/core/src/java/org/jahia/services/acl/JahiaBaseACL.java&rev=14845&repname=jahia
==============================================================================
--- trunk/core/src/java/org/jahia/services/acl/JahiaBaseACL.java (original)
+++ trunk/core/src/java/org/jahia/services/acl/JahiaBaseACL.java Fri Aug  4 
17:09:24 2006
@@ -99,23 +99,23 @@
      * @return The new ACL cloned, null if unsuccessfull.
      */
     public Object clone () {
-
+        super.clone();
         try {
             final JahiaBaseACL baseACL = new JahiaBaseACL ();
             baseACL.mACL = (JahiaAcl) mACL.clone ();
             return baseACL;
         } catch (JahiaException ex) {
+            //logger.debug(ex, ex);
         }
         return null;
     }
 
-
-    public static JahiaBaseACL getACL(int aclid, ContentObject object) throws 
JahiaException {
-        ContentObject pickedObject = object.getPickedObject();
+    public static JahiaBaseACL getACL(final int aclid, final ContentObject 
object) throws JahiaException {
+        if (object == null) return new JahiaBaseACL(aclid);
+        final ContentObject pickedObject = object.getPickedObject();
         if (pickedObject != null) {
             return new JahiaLinkedContentACL(aclid, object);
         }
         return new JahiaBaseACL(aclid);
     }
-
 }