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 2005/11/21 17:10:07 UTC

svn commit: r345924 - /directory/shared/ldap/trunk/common/src/main/java/org/apache/ldap/common/schema/CachingNormalizer.java

Author: elecharny
Date: Mon Nov 21 08:10:03 2005
New Revision: 345924

URL: http://svn.apache.org/viewcvs?rev=345924&view=rev
Log:
- Protect the normalize method from NPE
- avoid a double invocation of cache.containsKey

Modified:
    directory/shared/ldap/trunk/common/src/main/java/org/apache/ldap/common/schema/CachingNormalizer.java

Modified: directory/shared/ldap/trunk/common/src/main/java/org/apache/ldap/common/schema/CachingNormalizer.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/common/src/main/java/org/apache/ldap/common/schema/CachingNormalizer.java?rev=345924&r1=345923&r2=345924&view=diff
==============================================================================
--- directory/shared/ldap/trunk/common/src/main/java/org/apache/ldap/common/schema/CachingNormalizer.java (original)
+++ directory/shared/ldap/trunk/common/src/main/java/org/apache/ldap/common/schema/CachingNormalizer.java Mon Nov 21 08:10:03 2005
@@ -75,9 +75,16 @@
      */
     public Object normalize( Object value ) throws NamingException
     {
-        if ( cache.containsKey( value ) )
+    	if ( value == null )
+    	{
+    		return null;
+    	}
+    	
+    	Object result = cache.get( value );
+    	
+        if ( result != null )
         {
-            return cache.get( value ) ;
+            return result;
         }
         
         Object normalized = normalizer.normalize( value ) ;