Modified: river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/SoftIdentityReferenceKey.java URL: http://svn.apache.org/viewvc/river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/SoftIdentityReferenceKey.java?rev=1178329&r1=1178328&r2=1178329&view=diff ============================================================================== --- river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/SoftIdentityReferenceKey.java (original) +++ river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/SoftIdentityReferenceKey.java Mon Oct 3 08:24:23 2011 @@ -30,14 +30,6 @@ import java.lang.ref.SoftReference; class SoftIdentityReferenceKey<T> extends SoftReference<T> { private final int hash; - SoftIdentityReferenceKey(T k) { - super(k); - int hash = 7; - hash = 29 * hash + System.identityHashCode(k); - hash = 29 * hash + k.getClass().hashCode(); - this.hash = hash; - } - SoftIdentityReferenceKey(T k, ReferenceQueue<? super T> q) { super(k,q); int hash = 7; @@ -71,5 +63,4 @@ class SoftIdentityReferenceKey<T> extend if (s != null) return s.toString(); return super.toString(); } - }
Modified: river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/SoftReferenceKey.java URL: http://svn.apache.org/viewvc/river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/SoftReferenceKey.java?rev=1178329&r1=1178328&r2=1178329&view=diff ============================================================================== --- river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/SoftReferenceKey.java (original) +++ river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/SoftReferenceKey.java Mon Oct 3 08:24:23 2011 @@ -30,14 +30,6 @@ import java.lang.ref.SoftReference; class SoftReferenceKey<T> extends SoftReference<T> implements Comparable<SoftReferenceKey<T>>{ private final int hash; // Once the object is garbage collected, use it's identity. - SoftReferenceKey(T k) { - super(k); - int hash = 3; - hash = 67 * hash + System.identityHashCode(k); - hash = 67 * hash + k.getClass().hashCode(); - this.hash = hash; - } - SoftReferenceKey(T k, ReferenceQueue<? super T> q) { super(k,q); int hash = 3; Modified: river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/WeakIdentityReferenceKey.java URL: http://svn.apache.org/viewvc/river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/WeakIdentityReferenceKey.java?rev=1178329&r1=1178328&r2=1178329&view=diff ============================================================================== --- river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/WeakIdentityReferenceKey.java (original) +++ river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/WeakIdentityReferenceKey.java Mon Oct 3 08:24:23 2011 @@ -30,14 +30,6 @@ import java.lang.ref.WeakReference; class WeakIdentityReferenceKey<T> extends WeakReference<T> { private final int hash; - WeakIdentityReferenceKey(T k) { - super(k); - int hash = 5; - hash = 13 * hash + System.identityHashCode(k); - hash = 13 * hash + k.getClass().hashCode(); - this.hash = hash; - } - WeakIdentityReferenceKey(T k, ReferenceQueue<? super T> q) { super(k,q); int hash = 5; Modified: river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/WeakReferenceKey.java URL: http://svn.apache.org/viewvc/river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/WeakReferenceKey.java?rev=1178329&r1=1178328&r2=1178329&view=diff ============================================================================== --- river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/WeakReferenceKey.java (original) +++ river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/WeakReferenceKey.java Mon Oct 3 08:24:23 2011 @@ -30,14 +30,6 @@ import java.lang.ref.WeakReference; class WeakReferenceKey<T> extends WeakReference<T> implements Comparable<WeakReferenceKey<T>> { private final int hash; // Only used after referent has been garbage collected. - WeakReferenceKey(T k) { - super(k); - int hash = 7; - hash = 43 * hash + System.identityHashCode(k); - hash = 43 * hash + k.getClass().hashCode(); - this.hash = hash; - } - WeakReferenceKey(T k, ReferenceQueue<? super T> q) { super(k,q); int hash = 7; Modified: river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferenceCollectionTest.java URL: http://svn.apache.org/viewvc/river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferenceCollectionTest.java?rev=1178329&r1=1178328&r2=1178329&view=diff ============================================================================== --- river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferenceCollectionTest.java (original) +++ river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferenceCollectionTest.java Mon Oct 3 08:24:23 2011 @@ -20,7 +20,6 @@ package org.apache.river.impl.util; import java.util.ArrayList; import java.lang.ref.Reference; -import java.lang.ref.ReferenceQueue; import java.util.Arrays; import java.util.Collection; import java.util.Iterator; @@ -71,27 +70,6 @@ public class ReferenceCollectionTest { } /** - * Test of getQueue method, of class ReferenceCollection. - */ - @Test - public void testGetQueue() { - System.out.println("getQueue"); - ReferenceQueue result = instance.getQueue(); - assertTrue(result instanceof ReferenceQueue); - } - - /** - * Test of getType method, of class ReferenceCollection. - */ - @Test - public void testGetType() { - System.out.println("getType"); - Ref expResult = Ref.WEAK_IDENTITY; - Ref result = instance.getType(); - assertEquals(expResult, result); - } - - /** * Test of size method, of class ReferenceCollection. */ @Test
