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 2007/04/12 17:40:07 UTC

svn commit: r527985 - /directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java

Author: elecharny
Date: Thu Apr 12 08:40:06 2007
New Revision: 527985

URL: http://svn.apache.org/viewvc?view=rev&rev=527985
Log:
Fixed the deleteOldRdn test which was broken, and was not handling casing

Modified:
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java?view=diff&rev=527985&r1=527984&r2=527985
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java Thu Apr 12 08:40:06 2007
@@ -491,9 +491,9 @@
         if ( null != env.get( DELETE_OLD_RDN_PROP ) )
         {
             String delOldRdnStr = ( String ) env.get( DELETE_OLD_RDN_PROP );
-            delOldRdn = !delOldRdnStr.equals( "false" );
-            delOldRdn = delOldRdn || delOldRdnStr.equals( "no" );
-            delOldRdn = delOldRdn || delOldRdnStr.equals( "0" );
+            delOldRdn = !delOldRdnStr.equalsIgnoreCase( "false" ) && 
+                            !delOldRdnStr.equalsIgnoreCase( "no" ) && 
+                            !delOldRdnStr.equals( "0" );
         }
 
         /*