[jboss-cvs] JBossAS SVN: r69107 - in trunk/ejb3/src/main/org/jboss/ejb3: mdb and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Jan 18 07:16:26 EST 2008
Author: kabir.khan at jboss.com
Date: 2008-01-18 07:16:26 -0500 (Fri, 18 Jan 2008)
New Revision: 69107
Modified:
trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java
trunk/ejb3/src/main/org/jboss/ejb3/mdb/ConsumerContainer.java
trunk/ejb3/src/main/org/jboss/ejb3/mdb/MDB.java
trunk/ejb3/src/main/org/jboss/ejb3/service/ServiceContainer.java
trunk/ejb3/src/main/org/jboss/ejb3/session/SessionContainer.java
trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulContainer.java
trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessContainer.java
Log:
[EJBTHREE-1181] Use ClassContainer/Advisor.getMethodInfo() instead of accessing the deprecated methodInterceptors field directly
Modified: trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java 2008-01-18 11:36:38 UTC (rev 69106)
+++ trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java 2008-01-18 12:16:26 UTC (rev 69107)
@@ -1248,7 +1248,7 @@
public MethodInfo getMethodInfo(Method method)
{
long hash = MethodHashing.calculateHash(method);
- MethodInfo info = (MethodInfo) methodInterceptors.get(hash);
+ MethodInfo info = super.getMethodInfo(hash);
if (info == null)
{
throw new RuntimeException("Could not resolve beanClass method from proxy call: " + method.toString());
Modified: trunk/ejb3/src/main/org/jboss/ejb3/mdb/ConsumerContainer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/mdb/ConsumerContainer.java 2008-01-18 11:36:38 UTC (rev 69106)
+++ trunk/ejb3/src/main/org/jboss/ejb3/mdb/ConsumerContainer.java 2008-01-18 12:16:26 UTC (rev 69107)
@@ -98,7 +98,7 @@
{
Thread.currentThread().setContextClassLoader(classloader);
MethodInvocation si = (MethodInvocation) invocation;
- MethodInfo info = (MethodInfo) methodInterceptors.get(si.getMethodHash());
+ MethodInfo info = super.getMethodInfo(si.getMethodHash());
if (info == null)
{
throw new RuntimeException("Could not resolve beanClass method from proxy call");
Modified: trunk/ejb3/src/main/org/jboss/ejb3/mdb/MDB.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/mdb/MDB.java 2008-01-18 11:36:38 UTC (rev 69106)
+++ trunk/ejb3/src/main/org/jboss/ejb3/mdb/MDB.java 2008-01-18 12:16:26 UTC (rev 69107)
@@ -86,7 +86,7 @@
public MethodInfo getMethodInfo(Method method)
{
long hash = MethodHashing.calculateHash(method);
- MethodInfo info = (MethodInfo) methodInterceptors.get(hash);
+ MethodInfo info = super.getMethodInfo(hash);
return info;
}
Modified: trunk/ejb3/src/main/org/jboss/ejb3/service/ServiceContainer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/service/ServiceContainer.java 2008-01-18 11:36:38 UTC (rev 69106)
+++ trunk/ejb3/src/main/org/jboss/ejb3/service/ServiceContainer.java 2008-01-18 12:16:26 UTC (rev 69107)
@@ -345,7 +345,7 @@
Thread.currentThread().setContextClassLoader(classloader);
long hash = MethodHashing.calculateHash(method);
- MethodInfo info = (MethodInfo) methodInterceptors.get(hash);
+ MethodInfo info = super.getMethodInfo(hash);
if (info == null)
{
throw new RuntimeException("Could not resolve beanClass method from proxy call: " + method.toString());
@@ -386,7 +386,7 @@
EJBContainerInvocation newSi = null;
MethodInvocation si = (MethodInvocation) invocation;
- MethodInfo info = (MethodInfo) methodInterceptors.get(si.getMethodHash());
+ MethodInfo info = super.getMethodInfo(si.getMethodHash());
Method method = info.getUnadvisedMethod();
try
{
Modified: trunk/ejb3/src/main/org/jboss/ejb3/session/SessionContainer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/session/SessionContainer.java 2008-01-18 11:36:38 UTC (rev 69106)
+++ trunk/ejb3/src/main/org/jboss/ejb3/session/SessionContainer.java 2008-01-18 12:16:26 UTC (rev 69107)
@@ -357,7 +357,7 @@
try
{
long hash = MethodHashing.calculateHash(method);
- MethodInfo info = (MethodInfo) methodInterceptors.get(hash);
+ MethodInfo info = super.getMethodInfo(hash);
if (info == null)
{
throw new RuntimeException(
Modified: trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulContainer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulContainer.java 2008-01-18 11:36:38 UTC (rev 69106)
+++ trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulContainer.java 2008-01-18 12:16:26 UTC (rev 69107)
@@ -196,7 +196,7 @@
try
{
long hash = MethodHashing.calculateHash(method);
- MethodInfo info = (MethodInfo) methodInterceptors.get(hash);
+ MethodInfo info = super.getMethodInfo(hash);
if (info == null)
{
throw new RuntimeException(
@@ -227,7 +227,7 @@
try
{
long hash = MethodHashing.calculateHash(method);
- MethodInfo info = (MethodInfo) methodInterceptors.get(hash);
+ MethodInfo info = super.getMethodInfo(hash);
if (info == null)
{
throw new RuntimeException(
@@ -328,7 +328,7 @@
{
Thread.currentThread().setContextClassLoader(classloader);
StatefulRemoteInvocation si = (StatefulRemoteInvocation) invocation;
- MethodInfo info = (MethodInfo) methodInterceptors.get(si.getMethodHash());
+ MethodInfo info = super.getMethodInfo(si.getMethodHash());
if (info == null)
{
throw new RuntimeException("Could not resolve beanClass method from proxy call");
Modified: trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessContainer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessContainer.java 2008-01-18 11:36:38 UTC (rev 69106)
+++ trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessContainer.java 2008-01-18 12:16:26 UTC (rev 69107)
@@ -174,7 +174,7 @@
AllowedOperationsAssociation.pushInMethodFlag(AllowedOperationsFlags.IN_EJB_TIMEOUT);
try
{
- MethodInfo info = (MethodInfo) methodInterceptors.get(callbackHandler.getTimeoutCalllbackHash());
+ MethodInfo info = super.getMethodInfo(callbackHandler.getTimeoutCalllbackHash());
EJBContainerInvocation nextInvocation = new EJBContainerInvocation(info);
nextInvocation.setAdvisor(this);
nextInvocation.setArguments(args);
@@ -277,7 +277,7 @@
{
Thread.currentThread().setContextClassLoader(classloader);
MethodInvocation si = (MethodInvocation) invocation;
- MethodInfo info = (MethodInfo) methodInterceptors.get(si.getMethodHash());
+ MethodInfo info = super.getMethodInfo(si.getMethodHash());
if (info == null)
{
throw new RuntimeException("Could not resolve beanClass method from proxy call");
More information about the jboss-cvs-commits
mailing list