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 2010/05/19 19:44:11 UTC

svn commit: r946303 - /directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java

Author: elecharny
Date: Wed May 19 17:44:11 2010
New Revision: 946303

URL: http://svn.apache.org/viewvc?rev=946303&view=rev
Log:
More generics...

Modified:
    directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java

Modified: directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java?rev=946303&r1=946302&r2=946303&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java Wed May 19 17:44:11 2010
@@ -86,7 +86,7 @@ public class JdbmTable<K,V> implements T
     private int numDupLimit = JdbmIndex.DEFAULT_DUPLICATE_LIMIT;
 
     /** a cache of duplicate BTrees */
-    private final Map<Long, BTree> duplicateBtrees;
+    private final Map<Long, BTree<K, V>> duplicateBtrees;
 
     private final Serializer keySerializer;
 
@@ -446,7 +446,7 @@ public class JdbmTable<K,V> implements T
         }
 
         // last option is to try a btree with BTreeRedirects
-        BTree tree = getBTree( values.getBTreeRedirect() );
+        BTree<K, V> tree = getBTree( values.getBTreeRedirect() );
         
         return tree.size() != 0 && btreeHas( tree, val, true );
     }
@@ -477,7 +477,7 @@ public class JdbmTable<K,V> implements T
         }
 
         // last option is to try a btree with BTreeRedirects
-        BTree tree = getBTree( values.getBTreeRedirect() );
+        BTree<K, V> tree = getBTree( values.getBTreeRedirect() );
         
         return tree.size() != 0 && btreeHas( tree, val, false );
     }
@@ -902,7 +902,7 @@ public class JdbmTable<K,V> implements T
             return new EmptyCursor<org.apache.directory.server.xdbm.Tuple<K,V>>();
         }
 
-        Object raw = bt.find( key );
+        V raw = bt.find( key );
 
         if ( null == raw )
         {
@@ -935,7 +935,7 @@ public class JdbmTable<K,V> implements T
             return new EmptyCursor<V>();
         }
 
-        Object raw = bt.find( key );
+        V raw = bt.find( key );
 
         if ( null == raw )
         {