directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r952330 - in /directory/apacheds/trunk: i18n/src/main/java/org/apache/directory/server/i18n/I18n.java i18n/src/main/resources/org/apache/directory/server/i18n/errors.properties jdbm/src/main/java/jdbm/btree/BTree.java
Date Mon, 07 Jun 2010 16:47:14 GMT
Author: felixk
Date: Mon Jun  7 16:47:14 2010
New Revision: 952330

URL: http://svn.apache.org/viewvc?rev=952330&view=rev
Log:
Drop if tests

Modified:
    directory/apacheds/trunk/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java
    directory/apacheds/trunk/i18n/src/main/resources/org/apache/directory/server/i18n/errors.properties
    directory/apacheds/trunk/jdbm/src/main/java/jdbm/btree/BTree.java

Modified: directory/apacheds/trunk/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java?rev=952330&r1=952329&r2=952330&view=diff
==============================================================================
--- directory/apacheds/trunk/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java
(original)
+++ directory/apacheds/trunk/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java
Mon Jun  7 16:47:14 2010
@@ -553,8 +553,8 @@ public enum I18n
     ERR_517("ERR_517"),
     ERR_518("ERR_518"),
     ERR_519("ERR_519"),
-    ERR_520("ERR_520"),
-    ERR_521("ERR_521"),
+    // ERR_520("ERR_520"),
+    // ERR_521("ERR_521"),
     ERR_522("ERR_522"),
     ERR_523("ERR_523"),
     ERR_524("ERR_524"),

Modified: directory/apacheds/trunk/i18n/src/main/resources/org/apache/directory/server/i18n/errors.properties
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/i18n/src/main/resources/org/apache/directory/server/i18n/errors.properties?rev=952330&r1=952329&r2=952330&view=diff
==============================================================================
--- directory/apacheds/trunk/i18n/src/main/resources/org/apache/directory/server/i18n/errors.properties
(original)
+++ directory/apacheds/trunk/i18n/src/main/resources/org/apache/directory/server/i18n/errors.properties
Mon Jun  7 16:47:14 2010
@@ -541,8 +541,8 @@ ERR_516=Invalid child subordinate key
 ERR_517=Argument 'recman' is null
 ERR_518=Argument 'comparator' is null
 ERR_519=Argument 'comparator' must be serializable
-ERR_520=Argument 'keySerializer' must be serializable
-ERR_521=Argument 'valueSerializer' must be serializable
+# ERR_520=Argument 'keySerializer' must be serializable
+# ERR_521=Argument 'valueSerializer' must be serializable
 ERR_522=Argument 'pageSize' must be even
 ERR_523=Argument 'key' is null
 ERR_524=Argument 'value' is null

Modified: directory/apacheds/trunk/jdbm/src/main/java/jdbm/btree/BTree.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm/src/main/java/jdbm/btree/BTree.java?rev=952330&r1=952329&r2=952330&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm/src/main/java/jdbm/btree/BTree.java (original)
+++ directory/apacheds/trunk/jdbm/src/main/java/jdbm/btree/BTree.java Mon Jun  7 16:47:14
2010
@@ -206,16 +206,6 @@ public class BTree<K, V> implements Exte
             throw new IllegalArgumentException( I18n.err( I18n.ERR_519 ) );
         }
 
-        if ( ( keySerializer != null ) && ! ( keySerializer instanceof Serializable
) )
-        {
-            throw new IllegalArgumentException( I18n.err( I18n.ERR_520 ) );
-        }
-
-        if ( ( valueSerializer != null ) && !( valueSerializer instanceof Serializable
) )
-        {
-            throw new IllegalArgumentException( I18n.err( I18n.ERR_521 ) );
-        }
-
         // make sure there's an even number of entries per BPage
         if ( ( pageSize & 1 ) != 0 )
         {



Mime
View raw message