User: starksm
Date: 01/06/25 10:51:10
Modified: src/main/org/jboss/ejb ContainerFactory.java
Log:
Fix the parsing of the container-interceptors/interceptor transaction
attribute value to recoginze Both
Revision Changes Path
1.80 +11 -9 jboss/src/main/org/jboss/ejb/ContainerFactory.java
Index: ContainerFactory.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/ContainerFactory.java,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- ContainerFactory.java 2001/06/20 07:20:43 1.79
+++ ContainerFactory.java 2001/06/25 17:51:10 1.80
@@ -81,19 +81,19 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Peter Antman</a>.
* @author <a href="mailto:[EMAIL PROTECTED]";>Scott Stark</a>
*
-* @version $Revision: 1.79 $
+* @version $Revision: 1.80 $
*/
public class ContainerFactory
extends org.jboss.util.ServiceMBeanSupport
implements ContainerFactoryMBean
{
- // Constants -----------------------------------------------------
- public static String DEFAULT_STATELESS_CONFIGURATION = "Default Stateless
SessionBean";
- public static String DEFAULT_STATEFUL_CONFIGURATION = "Default Stateful
SessionBean";
- public static String DEFAULT_ENTITY_BMP_CONFIGURATION = "Default BMP EntityBean";
- public static String DEFAULT_ENTITY_CMP_CONFIGURATION = "Default CMP EntityBean";
- public static String DEFAULT_MESSAGEDRIVEN_CONFIGURATION = "Default MesageDriven
Bean";
- // Constants uses with container interceptor configurations
+ // Constants -----------------------------------------------------
+ public static String DEFAULT_STATELESS_CONFIGURATION = "Default Stateless
SessionBean";
+ public static String DEFAULT_STATEFUL_CONFIGURATION = "Default Stateful
SessionBean";
+ public static String DEFAULT_ENTITY_BMP_CONFIGURATION = "Default BMP EntityBean";
+ public static String DEFAULT_ENTITY_CMP_CONFIGURATION = "Default CMP EntityBean";
+ public static String DEFAULT_MESSAGEDRIVEN_CONFIGURATION = "Default MesageDriven
Bean";
+ // Constants uses with container interceptor configurations
public static final int BMT = 1;
public static final int CMT = 2;
public static final int ANY = 3;
@@ -815,7 +815,9 @@
of transType
*/
String transAttr = ielement.getAttribute("transaction");
- if( transAttr.length() == 0 ||
transAttr.equalsIgnoreCase(transTypeString) )
+ if( transAttr == null || transAttr.length() == 0 )
+ transAttr = ANY_VALUE;
+ if( transAttr.equalsIgnoreCase(ANY_VALUE) ||
transAttr.equalsIgnoreCase(transTypeString) )
{ // The transaction type matches the container bean trans type,
check the metricsEnabled
String metricsAttr = ielement.getAttribute("metricsEnabled");
boolean metricsInterceptor = metricsAttr.equalsIgnoreCase("true");
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
