Author: genspring
Date: Thu May 26 03:39:37 2011
New Revision: 1127771
URL: http://svn.apache.org/viewvc?rev=1127771&view=rev
Log:
Only get timout from timerMethodInfo if the info is not null.
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.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=1127771&r1=1127770&r2=1127771&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
Thu May 26 03:39:37 2011
@@ -349,7 +349,7 @@ class EnterpriseBeanBuilder {
try {
if (TimedObject.class.isAssignableFrom(ejbClass)) {
timeout = ejbClass.getMethod("ejbTimeout", Timer.class);
- } else {
+ } else if (info != null){
try {
timeout = MethodInfoUtil.toMethod(ejbClass, info);
} catch (IllegalStateException e) {
