directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r1025953 - in /directory/shared/trunk/ldap/src: main/java/org/apache/directory/shared/ldap/name/RDN.java test/java/org/apache/directory/shared/ldap/name/MultiThreadedTest.java
Date Thu, 21 Oct 2010 11:16:32 GMT
Author: seelmann
Date: Thu Oct 21 11:16:31 2010
New Revision: 1025953

URL: http://svn.apache.org/viewvc?rev=1025953&view=rev
Log:
Forgot to create a new AtomicBoolean on clone(), activated shortcut when RDN is already normalized,
activated multi-threaded test

Modified:
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RDN.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/MultiThreadedTest.java

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RDN.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RDN.java?rev=1025953&r1=1025952&r2=1025953&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RDN.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RDN.java
Thu Oct 21 11:16:31 2010
@@ -189,7 +189,7 @@ public class RDN implements Cloneable, C
     public static final int EQUAL = 0;
 
     /** A flag used to tell if the RDN has been normalized */
-    private final AtomicBoolean normalized = new AtomicBoolean();
+    private AtomicBoolean normalized = new AtomicBoolean();
 
     /** the schema manager */
     private transient SchemaManager schemaManager;
@@ -526,11 +526,10 @@ public class RDN implements Cloneable, C
             return this;
         }
 
-        // this breaks the RenameReferralIgnoreIT
-        //if ( normalized.get() )
-        //{
-        //    return this;
-        //}
+        if ( normalized.get() )
+        {
+            return this;
+        }
 
         synchronized ( this )
         {
@@ -856,6 +855,7 @@ public class RDN implements Cloneable, C
         try
         {
             RDN rdn = ( RDN ) super.clone();
+            rdn.normalized = new AtomicBoolean( normalized.get() );
 
             // The AttributeTypeAndValue is immutable. We won't clone it
 

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/MultiThreadedTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/MultiThreadedTest.java?rev=1025953&r1=1025952&r2=1025953&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/MultiThreadedTest.java
(original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/MultiThreadedTest.java
Thu Oct 21 11:16:31 2010
@@ -46,7 +46,6 @@ import org.junit.runner.RunWith;
  */
 @RunWith(ConcurrentJunitRunner.class)
 @Concurrent()
-@Ignore
 public class MultiThreadedTest
 {
     @Rule



Mime
View raw message