[weld-commits] Weld SVN: r6145 - extensions/trunk/src/main/java/org/jboss/weld/extensions/beanid.

[weld-commits at lists.jboss.org]

Author: swd847
Date: 2010-04-21 22:13:38 -0400 (Wed, 21 Apr 2010)
New Revision: 6145

Removed:
   extensions/trunk/src/main/java/org/jboss/weld/extensions/beanid/IdentityWrapper.java
Modified:
   extensions/trunk/src/main/java/org/jboss/weld/extensions/beanid/IdentifiableBeanExtension.java
   extensions/trunk/src/main/java/org/jboss/weld/extensions/beanid/IdentifiableInjectionTarget.java
Log:
revert previous changes, as the IdentityWrappers would be gc'ed to early



Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/beanid/IdentifiableBeanExtension.java
===================================================================
--- extensions/trunk/src/main/java/org/jboss/weld/extensions/beanid/IdentifiableBeanExtension.java	2010-04-22 02:02:14 UTC (rev 6144)
+++ extensions/trunk/src/main/java/org/jboss/weld/extensions/beanid/IdentifiableBeanExtension.java	2010-04-22 02:13:38 UTC (rev 6145)
@@ -20,7 +20,7 @@
  */
 public class IdentifiableBeanExtension implements Extension
 {
-   Map<IdentityWrapper, AnnotatedType<?>> types = Collections.synchronizedMap(new WeakHashMap<IdentityWrapper, AnnotatedType<?>>(1000));
+   Map<Object, AnnotatedType<?>> types = Collections.synchronizedMap(new WeakHashMap<Object, AnnotatedType<?>>(1000));
 
    public void processInjectionTarget(@Observes ProcessInjectionTarget<?> event)
    {
@@ -55,7 +55,7 @@
    
    public AnnotatedType<?> getAnnotatedType(Object instance)
    {
-      return types.get(new IdentityWrapper(instance));
+      return types.get(instance);
    }
    
 }

Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/beanid/IdentifiableInjectionTarget.java
===================================================================
--- extensions/trunk/src/main/java/org/jboss/weld/extensions/beanid/IdentifiableInjectionTarget.java	2010-04-22 02:02:14 UTC (rev 6144)
+++ extensions/trunk/src/main/java/org/jboss/weld/extensions/beanid/IdentifiableInjectionTarget.java	2010-04-22 02:13:38 UTC (rev 6145)
@@ -20,9 +20,9 @@
    
    AnnotatedType<?> type;
    
-   Map<IdentityWrapper, AnnotatedType<?>> typeMap;
+   Map<Object, AnnotatedType<?>> typeMap;
    
-   IdentifiableInjectionTarget(InjectionTarget<T> delegate, AnnotatedType<?> type, Map<IdentityWrapper, AnnotatedType<?>> typeMap)
+   IdentifiableInjectionTarget(InjectionTarget<T> delegate, AnnotatedType<?> type, Map<Object, AnnotatedType<?>> typeMap)
    {
       this.delegate = delegate;
       this.type=type;
@@ -32,7 +32,7 @@
    
    public void inject(T instance, CreationalContext<T> ctx)
    {
-      typeMap.put(new IdentityWrapper(instance), type);
+      typeMap.put(instance, type);
       delegate.inject(instance, ctx);
    }
 
@@ -48,7 +48,7 @@
 
    public void dispose(T instance)
    {
-      typeMap.remove(new IdentityWrapper(instance));
+      typeMap.remove(instance);
       delegate.dispose(instance);
    }
 

Deleted: extensions/trunk/src/main/java/org/jboss/weld/extensions/beanid/IdentityWrapper.java
===================================================================
--- extensions/trunk/src/main/java/org/jboss/weld/extensions/beanid/IdentityWrapper.java	2010-04-22 02:02:14 UTC (rev 6144)
+++ extensions/trunk/src/main/java/org/jboss/weld/extensions/beanid/IdentityWrapper.java	2010-04-22 02:13:38 UTC (rev 6145)
@@ -1,40 +0,0 @@
-package org.jboss.weld.extensions.beanid;
-
-/**
- * wrapper that overrides equals and hashCode to work on object identity
- * 
- * 
- * @author Stuart Douglas <stuart at baileyroberts.com.au>
- *
- */
-public class IdentityWrapper
-{
-   final Object object;
-
-   public IdentityWrapper(Object object)
-   {
-      this.object = object;
-   }
-
-   public Object getObject()
-   {
-      return object;
-   }
-
-   @Override
-   public boolean equals(Object arg0)
-   {
-      if (arg0 instanceof IdentityWrapper)
-      {
-         IdentityWrapper w = (IdentityWrapper) arg0;
-         return w.getObject() == object;
-      }
-      return object == arg0;
-   }
-
-   @Override
-   public int hashCode()
-   {
-      return System.identityHashCode(object);
-   }
-}