svn commit: r1778703 - in /directory/apacheds/branches/apacheds-value/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers: request/ sasl/ sasl/gssapi/ sasl/plain/

[el...@apache.org]

Author: elecharny
Date: Sat Jan 14 01:53:57 2017
New Revision: 1778703

URL: http://svn.apache.org/viewvc?rev=1778703&view=rev
Log:
Used Strings.EMPTY_BYTES instead of StringConstants.EMPTY_BYTES

Modified:
    directory/apacheds/branches/apacheds-value/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/request/BindRequestHandler.java
    directory/apacheds/branches/apacheds-value/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/sasl/AbstractSaslServer.java
    directory/apacheds/branches/apacheds-value/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/sasl/gssapi/GssapiCallbackHandler.java
    directory/apacheds/branches/apacheds-value/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/sasl/plain/PlainSaslServer.java

Modified: directory/apacheds/branches/apacheds-value/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/request/BindRequestHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/request/BindRequestHandler.java?rev=1778703&r1=1778702&r2=1778703&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/request/BindRequestHandler.java (original)
+++ directory/apacheds/branches/apacheds-value/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/request/BindRequestHandler.java Sat Jan 14 01:53:57 2017
@@ -36,7 +36,6 @@ import org.apache.directory.api.ldap.mod
 import org.apache.directory.api.ldap.model.message.LdapResult;
 import org.apache.directory.api.ldap.model.message.ResultCodeEnum;
 import org.apache.directory.api.ldap.model.name.Dn;
-import org.apache.directory.api.util.StringConstants;
 import org.apache.directory.api.util.Strings;
 import org.apache.directory.server.core.api.CoreSession;
 import org.apache.directory.server.core.api.DirectoryService;
@@ -322,7 +321,7 @@ public class BindRequestHandler extends
         // SaslServer will throw an exception if the credentials are null.
         if ( bindRequest.getCredentials() == null )
         {
-            bindRequest.setCredentials( StringConstants.EMPTY_BYTES );
+            bindRequest.setCredentials( Strings.EMPTY_BYTES );
         }
 
         try

Modified: directory/apacheds/branches/apacheds-value/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/sasl/AbstractSaslServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/sasl/AbstractSaslServer.java?rev=1778703&r1=1778702&r2=1778703&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/sasl/AbstractSaslServer.java (original)
+++ directory/apacheds/branches/apacheds-value/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/sasl/AbstractSaslServer.java Sat Jan 14 01:53:57 2017
@@ -24,7 +24,6 @@ import javax.security.sasl.SaslException
 import javax.security.sasl.SaslServer;
 
 import org.apache.directory.api.ldap.model.message.BindRequest;
-import org.apache.directory.api.util.StringConstants;
 import org.apache.directory.api.util.Strings;
 import org.apache.directory.server.core.api.CoreSession;
 import org.apache.directory.server.ldap.LdapSession;
@@ -63,7 +62,7 @@ public abstract class AbstractSaslServer
      */
     public byte[] unwrap( byte[] incoming, int offset, int len ) throws SaslException
     {
-        return StringConstants.EMPTY_BYTES;
+        return Strings.EMPTY_BYTES;
     }
 
 

Modified: directory/apacheds/branches/apacheds-value/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/sasl/gssapi/GssapiCallbackHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/sasl/gssapi/GssapiCallbackHandler.java?rev=1778703&r1=1778702&r2=1778703&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/sasl/gssapi/GssapiCallbackHandler.java (original)
+++ directory/apacheds/branches/apacheds-value/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/sasl/gssapi/GssapiCallbackHandler.java Sat Jan 14 01:53:57 2017
@@ -28,7 +28,7 @@ import org.apache.directory.api.ldap.mod
 import org.apache.directory.api.ldap.model.entry.Attribute;
 import org.apache.directory.api.ldap.model.message.BindRequest;
 import org.apache.directory.api.ldap.model.name.Dn;
-import org.apache.directory.api.util.StringConstants;
+import org.apache.directory.api.util.Strings;
 import org.apache.directory.server.core.api.CoreSession;
 import org.apache.directory.server.core.api.LdapPrincipal;
 import org.apache.directory.server.kerberos.shared.store.PrincipalStoreEntry;
@@ -86,7 +86,7 @@ public class GssapiCallbackHandler exten
 
         LdapPrincipal ldapPrincipal = new LdapPrincipal( adminSession.getDirectoryService().getSchemaManager(),
             new Dn( entry.getDistinguishedName() ),
-            AuthenticationLevel.STRONG, StringConstants.EMPTY_BYTES );
+            AuthenticationLevel.STRONG, Strings.EMPTY_BYTES );
         ldapSession.putSaslProperty( SaslConstants.SASL_AUTHENT_USER, ldapPrincipal );
         ldapSession.putSaslProperty( Context.SECURITY_PRINCIPAL, bindDn );
 

Modified: directory/apacheds/branches/apacheds-value/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/sasl/plain/PlainSaslServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/sasl/plain/PlainSaslServer.java?rev=1778703&r1=1778702&r2=1778703&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/sasl/plain/PlainSaslServer.java (original)
+++ directory/apacheds/branches/apacheds-value/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/sasl/plain/PlainSaslServer.java Sat Jan 14 01:53:57 2017
@@ -34,7 +34,6 @@ import org.apache.directory.api.ldap.mod
 import org.apache.directory.api.ldap.model.message.BindRequest;
 import org.apache.directory.api.ldap.model.message.SearchScope;
 import org.apache.directory.api.ldap.model.schema.PrepareString;
-import org.apache.directory.api.util.StringConstants;
 import org.apache.directory.api.util.Strings;
 import org.apache.directory.server.core.api.CoreSession;
 import org.apache.directory.server.core.api.DirectoryService;
@@ -239,7 +238,7 @@ public final class PlainSaslServer exten
             }
         }
 
-        return StringConstants.EMPTY_BYTES;
+        return Strings.EMPTY_BYTES;
     }