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 2018/08/20 22:40:27 UTC
[directory-server] branch master updated: Some more sonarLint fixes
This is an automated email from the ASF dual-hosted git repository.
elecharny pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-server.git
The following commit(s) were added to refs/heads/master by this push:
new 9ba3865 Some more sonarLint fixes
9ba3865 is described below
commit 9ba386502fa2cc52e40e563ad7207a5a9d82091d
Author: Emmanuel Lécharny <el...@symas.com>
AuthorDate: Tue Aug 21 00:40:25 2018 +0200
Some more sonarLint fixes
---
.../server/core/api/administrative/CollectiveAttributeAAP.java | 2 ++
.../org/apache/directory/server/core/api/event/ScopeEvaluator.java | 4 ++++
.../directory/server/core/avltree/AvlSingletonOrOrderedSetCursor.java | 2 ++
.../java/org/apache/directory/server/core/avltree/AvlTreeImpl.java | 4 ++--
4 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/core-api/src/main/java/org/apache/directory/server/core/api/administrative/CollectiveAttributeAAP.java b/core-api/src/main/java/org/apache/directory/server/core/api/administrative/CollectiveAttributeAAP.java
index 2189285..9df2123 100644
--- a/core-api/src/main/java/org/apache/directory/server/core/api/administrative/CollectiveAttributeAAP.java
+++ b/core-api/src/main/java/org/apache/directory/server/core/api/administrative/CollectiveAttributeAAP.java
@@ -66,6 +66,7 @@ public class CollectiveAttributeAAP extends CollectiveAttributeAdministrativePoi
/**
* {@inheritDoc}
*/
+ @Override
public boolean isAutonomous()
{
return true;
@@ -75,6 +76,7 @@ public class CollectiveAttributeAAP extends CollectiveAttributeAdministrativePoi
/**
* {@inheritDoc}
*/
+ @Override
public String toString()
{
return "CollectiveAttribute AAP : " + super.toString();
diff --git a/core-api/src/main/java/org/apache/directory/server/core/api/event/ScopeEvaluator.java b/core-api/src/main/java/org/apache/directory/server/core/api/event/ScopeEvaluator.java
index 03334af..6fede94 100644
--- a/core-api/src/main/java/org/apache/directory/server/core/api/event/ScopeEvaluator.java
+++ b/core-api/src/main/java/org/apache/directory/server/core/api/event/ScopeEvaluator.java
@@ -58,6 +58,10 @@ public class ScopeEvaluator implements Evaluator
{
return ( snode.getBaseDn().size() + 1 ) == dn.size();
}
+ else
+ {
+ return false;
+ }
case SUBTREE:
return dn.isDescendantOf( snode.getBaseDn() );
diff --git a/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlSingletonOrOrderedSetCursor.java b/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlSingletonOrOrderedSetCursor.java
index f3428e6..fc73e69 100644
--- a/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlSingletonOrOrderedSetCursor.java
+++ b/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlSingletonOrOrderedSetCursor.java
@@ -336,6 +336,7 @@ public class AvlSingletonOrOrderedSetCursor<K, V> extends AbstractCursor<Tuple<K
/**
* {@inheritDoc}
*/
+ @Override
public void close() throws IOException
{
if ( IS_DEBUG )
@@ -350,6 +351,7 @@ public class AvlSingletonOrOrderedSetCursor<K, V> extends AbstractCursor<Tuple<K
/**
* {@inheritDoc}
*/
+ @Override
public void close( Exception reason ) throws IOException
{
if ( IS_DEBUG )
diff --git a/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeImpl.java b/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeImpl.java
index 5b4654c..2553ad4 100644
--- a/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeImpl.java
+++ b/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeImpl.java
@@ -325,13 +325,13 @@ public class AvlTreeImpl<K> implements AvlTree<K>
{
LinkedAvlNode<K> parentNode = null;
- int size = treePath.size();
+ int treePathSize = treePath.size();
for ( LinkedAvlNode<K> node : treePath )
{
int balFactor = getBalance( node );
- if ( node != root && treePath.indexOf( node ) < ( size - 1 ) )
+ if ( node != root && treePath.indexOf( node ) < ( treePathSize - 1 ) )
{
parentNode = treePath.get( treePath.indexOf( node ) + 1 );
}