tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dblev...@apache.org
Subject svn commit: r643530 - in /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb: assembler/classic/EnterpriseBeanBuilder.java core/CoreDeploymentInfo.java
Date Tue, 01 Apr 2008 19:38:04 GMT
Author: dblevins
Date: Tue Apr  1 12:37:52 2008
New Revision: 643530

URL: http://svn.apache.org/viewvc?rev=643530&view=rev
Log:
Hopefully final fix for tx and security attribute inheritance

Modified:
    openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.java
    openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreDeploymentInfo.java

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.java?rev=643530&r1=643529&r2=643530&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.java
(original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.java
Tue Apr  1 12:37:52 2008
@@ -335,7 +335,7 @@
         }
 
         try {
-            method = clazz.getMethod(info.methodName, parameterTypes.toArray(new Class[parameterTypes.size()]));
+            method = clazz.getDeclaredMethod(info.methodName, parameterTypes.toArray(new
Class[parameterTypes.size()]));
         } catch (NoSuchMethodException e) {
             throw new IllegalStateException("Callback method does not exist: " + clazz.getName()
+ "." + info.methodName, e);
         }

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreDeploymentInfo.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreDeploymentInfo.java?rev=643530&r1=643529&r2=643530&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreDeploymentInfo.java
(original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreDeploymentInfo.java
Tue Apr  1 12:37:52 2008
@@ -351,6 +351,12 @@
 
     public byte getTransactionAttribute(Method method) {
         Byte byteWrapper = methodTransactionAttributes.get(method);
+
+        if (byteWrapper == null){
+            Method beanMethod = getMatchingBeanMethod(method);
+            byteWrapper = methodTransactionAttributes.get(beanMethod);
+        }
+
         if (byteWrapper == null) {
             return TX_NOT_SUPPORTED;// non remote or home interface method
         } else {



Mime
View raw message