svn commit: r1369710 - in /openejb/trunk/openejb/container/openejb-core/src: main/java/org/apache/openejb/util/proxy/ test/java/org/apache/openejb/core/stateless/

[dblevins]

Author: dblevins
Date: Mon Aug  6 01:12:58 2012
New Revision: 1369710

URL: http://svn.apache.org/viewvc?rev=1369710&view=rev
Log:
Reverting OPENEJB-1882 as java.lang.Object equals() and hashCode() have 
specific EJB requirements and are tested in the TCK
Reverting clears up some TCK failures

Removed:
    
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/ThisInConstructorTest.java
Modified:
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyGeneratorImpl.java

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java?rev=1369710&r1=1369709&r2=1369710&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java
 Mon Aug  6 01:12:58 2012
@@ -27,7 +27,7 @@ import javax.ejb.EJBException;
 public class LocalBeanProxyFactory {
 
     private static final java.lang.reflect.InvocationHandler 
NON_BUSINESS_HANDLER = new NonBusinessHandler();
-
+    
     public static Object newProxyInstance(ClassLoader cl, Class interfce, 
java.lang.reflect.InvocationHandler h) throws IllegalArgumentException {
             try {
             Class proxyCls = new 
LocalBeanProxyGeneratorImpl().createProxy(interfce, cl);

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyGeneratorImpl.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyGeneratorImpl.java?rev=1369710&r1=1369709&r2=1369710&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyGeneratorImpl.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyGeneratorImpl.java
 Mon Aug  6 01:12:58 2012
@@ -192,7 +192,8 @@ public class LocalBeanProxyGeneratorImpl
                    }
                }
                
-               return cw.toByteArray();
+               byte[] clsBytes = cw.toByteArray();
+               return clsBytes;
        }
 
        /*
@@ -211,8 +212,7 @@ public class LocalBeanProxyGeneratorImpl
                        int modifiers = method.getModifiers();
                        if (Modifier.isFinal(modifiers) || 
                            Modifier.isPrivate(modifiers) || 
-                           Modifier.isStatic(modifiers) ||
-                            method.getDeclaringClass().equals(Object.class)) {
+                           Modifier.isStatic(modifiers)) {
                            continue;
                        }