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 2017/10/25 14:36:35 UTC

svn commit: r1813302 - /directory/apacheds/trunk/interceptors/operational/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java

Author: elecharny
Date: Wed Oct 25 14:36:34 2017
New Revision: 1813302

URL: http://svn.apache.org/viewvc?rev=1813302&view=rev
Log:
Fixed some sonar issues, renamed a method parameter

Modified:
    directory/apacheds/trunk/interceptors/operational/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java

Modified: directory/apacheds/trunk/interceptors/operational/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/operational/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java?rev=1813302&r1=1813301&r2=1813302&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/operational/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java (original)
+++ directory/apacheds/trunk/interceptors/operational/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java Wed Oct 25 14:36:34 2017
@@ -640,7 +640,7 @@ public class OperationalAttributeInterce
     }
     
     
-    private void processSubordinates( Set<AttributeTypeOptions> returningAttributes, boolean allAttributes, Entry entry ) 
+    private void processSubordinates( Set<AttributeTypeOptions> returningAttributes, boolean allOpAttributes, Entry entry ) 
         throws LdapException
     {
         // Bypass the rootDSE : we won't get the nbChildren and nbSubordiantes for this special entry
@@ -657,8 +657,8 @@ public class OperationalAttributeInterce
         
         if ( returningAttributes != null )
         {
-            boolean nbChildrenRequested = returningAttributes.contains( nbChildrenAto ) | allAttributes;
-            boolean nbSubordinatesRequested = returningAttributes.contains( nbSubordinatesAto ) | allAttributes;
+            boolean nbChildrenRequested = returningAttributes.contains( nbChildrenAto ) || allOpAttributes;
+            boolean nbSubordinatesRequested = returningAttributes.contains( nbSubordinatesAto ) || allOpAttributes;
 
             if ( nbChildrenRequested || nbSubordinatesRequested )
             {