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:20:21 UTC

svn commit: r1744096 - in /directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2: ParserUtils.java request/SearchRequestDsml.java response/SearchResultDoneDsml.java

Author: elecharny
Date: Mon May 16 17:20:21 2016
New Revision: 1744096

URL: http://svn.apache.org/viewvc?rev=1744096&view=rev
Log:
o Removed duplicated or useless code

Modified:
    directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/ParserUtils.java
    directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/SearchRequestDsml.java
    directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/SearchResultDoneDsml.java

Modified: directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/ParserUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/ParserUtils.java?rev=1744096&r1=1744095&r2=1744096&view=diff
==============================================================================
--- directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/ParserUtils.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/ParserUtils.java Mon May 16 17:20:21 2016
@@ -154,10 +154,6 @@ public final class ParserUtils
         {
             return false;
         }
-        else if ( value instanceof Value )
-        {
-            return false;
-        }
         else if ( value instanceof byte[] )
         {
             return true;

Modified: directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/SearchRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/SearchRequestDsml.java?rev=1744096&r1=1744095&r2=1744096&view=diff
==============================================================================
--- directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/SearchRequestDsml.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/SearchRequestDsml.java Mon May 16 17:20:21 2016
@@ -214,7 +214,7 @@ public class SearchRequestDsml
                 {
                     branch = new OrNode();
                 }
-                else if ( filter instanceof NotFilter )
+                else
                 {
                     branch = new NotNode();
                 }

Modified: directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/SearchResultDoneDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/SearchResultDoneDsml.java?rev=1744096&r1=1744095&r2=1744096&view=diff
==============================================================================
--- directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/SearchResultDoneDsml.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/SearchResultDoneDsml.java Mon May 16 17:20:21 2016
@@ -87,10 +87,8 @@ public class SearchResultDoneDsml extend
 
         LdapResultDsml ldapResultDsml =
             new LdapResultDsml( getCodecService(), getDecorated().getLdapResult(), getDecorated() );
-        if ( ldapResultDsml != null )
-        {
-            ldapResultDsml.toDsml( element );
-        }
+        
+        ldapResultDsml.toDsml( element );
 
         return element;
     }