You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2008/04/01 22:01:46 UTC
svn commit: r643548 - in
/openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb:
assembler/classic/EnterpriseBeanBuilder.java core/CoreDeploymentInfo.java
Author: dblevins
Date: Tue Apr 1 13:01:42 2008
New Revision: 643548
URL: http://svn.apache.org/viewvc?rev=643548&view=rev
Log:
Merging r643530 - http://svn.apache.org/viewvc?rev=643530&view=rev
svn merge -r 643529:643530 https://svn.apache.org/repos/asf/openejb/trunk/openejb3 .
------------------------------------------------------------------------
r643530 | dblevins | 2008-04-01 12:37:52 -0700 (Tue, 01 Apr 2008) | 2 lines
Hopefully final fix for tx and security attribute inheritance
------------------------------------------------------------------------
Modified:
openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.java
openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/core/CoreDeploymentInfo.java
Modified: openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.java?rev=643548&r1=643547&r2=643548&view=diff
==============================================================================
--- openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.java (original)
+++ openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.java Tue Apr 1 13:01:42 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/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/core/CoreDeploymentInfo.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/core/CoreDeploymentInfo.java?rev=643548&r1=643547&r2=643548&view=diff
==============================================================================
--- openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/core/CoreDeploymentInfo.java (original)
+++ openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/core/CoreDeploymentInfo.java Tue Apr 1 13:01:42 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 {