You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2016/05/16 17:16:15 UTC

svn commit: r1744091 - in /directory/shared/branches/shared-value/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci: UserClass.java protectedItem/AbstractAttributeTypeProtectedItem.java

Author: elecharny
Date: Mon May 16 17:16:15 2016
New Revision: 1744091

URL: http://svn.apache.org/viewvc?rev=1744091&view=rev
Log:
Fixed some warnings

Modified:
    directory/shared/branches/shared-value/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/UserClass.java
    directory/shared/branches/shared-value/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/protectedItem/AbstractAttributeTypeProtectedItem.java

Modified: directory/shared/branches/shared-value/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/UserClass.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/UserClass.java?rev=1744091&r1=1744090&r2=1744091&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/UserClass.java (original)
+++ directory/shared/branches/shared-value/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/UserClass.java Mon May 16 17:16:15 2016
@@ -185,8 +185,8 @@ public abstract class UserClass
             {
                 return true;
             }
-
-            if ( o == null )
+            
+            if ( !( o instanceof NamedUserClass ) )
             {
                 return false;
             }

Modified: directory/shared/branches/shared-value/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/protectedItem/AbstractAttributeTypeProtectedItem.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/protectedItem/AbstractAttributeTypeProtectedItem.java?rev=1744091&r1=1744090&r2=1744091&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/protectedItem/AbstractAttributeTypeProtectedItem.java (original)
+++ directory/shared/branches/shared-value/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/protectedItem/AbstractAttributeTypeProtectedItem.java Mon May 16 17:16:15 2016
@@ -82,18 +82,14 @@ public abstract class AbstractAttributeT
             return true;
         }
 
-        if ( o == null )
+        if ( !( o instanceof AbstractAttributeTypeProtectedItem ) )
         {
             return false;
         }
 
-        if ( getClass().isAssignableFrom( o.getClass() ) )
-        {
-            AbstractAttributeTypeProtectedItem that = ( AbstractAttributeTypeProtectedItem ) o;
-            return this.attributeTypes.equals( that.attributeTypes );
-        }
+        AbstractAttributeTypeProtectedItem that = ( AbstractAttributeTypeProtectedItem ) o;
 
-        return false;
+        return this.attributeTypes.equals( that.attributeTypes );
     }