[jboss-cvs] JBossAS SVN: r81741 - in projects/ejb3/trunk: installer/src/main/resources/conf and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: wolfc
Date: 2008-11-27 11:52:36 -0500 (Thu, 27 Nov 2008)
New Revision: 81741

Modified:
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/connectionmanager/CachedConnectionInterceptor.java
   projects/ejb3/trunk/installer/src/main/resources/conf/jbossas-ejb3-files-to-place-in-deploy-unclustered.txt
Log:
EJBTHREE-1028: backwards compatible for plugin usage

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/connectionmanager/CachedConnectionInterceptor.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/connectionmanager/CachedConnectionInterceptor.java	2008-11-27 16:31:47 UTC (rev 81740)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/connectionmanager/CachedConnectionInterceptor.java	2008-11-27 16:52:36 UTC (rev 81741)
@@ -28,6 +28,7 @@
 import org.jboss.ejb3.EJBContainer;
 import org.jboss.ejb3.EJBContainerInvocation;
 import org.jboss.ejb3.aop.AbstractInterceptor;
+import org.jboss.logging.Logger;
 
 /**
  * @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
@@ -35,6 +36,7 @@
  */
 public class CachedConnectionInterceptor extends AbstractInterceptor
 {
+   private static final Logger log = Logger.getLogger(CachedConnectionInterceptor.class);
    private final Set<String> unsharableResources;
    
    public CachedConnectionInterceptor(Set<String> unsharableResources)
@@ -47,6 +49,11 @@
       EJBContainerInvocation<EJBContainer, BeanContext<?>> containerInvocation = (EJBContainerInvocation<EJBContainer, BeanContext<?>>) invocation;
       EJBContainer container = getEJBContainer(invocation);
       CachedConnectionManager ccm = container.getCachedConnectionManager();
+      if(ccm == null)
+      {
+         log.warn("EJBTHREE-1028: No ejb3 CachedConnectionManager installed");
+         return containerInvocation.invokeNext();
+      }
       Object key = containerInvocation.getBeanContext().getInstance();
       ccm.pushMetaDataAwareObject(key, unsharableResources);
       try

Modified: projects/ejb3/trunk/installer/src/main/resources/conf/jbossas-ejb3-files-to-place-in-deploy-unclustered.txt
===================================================================
--- projects/ejb3/trunk/installer/src/main/resources/conf/jbossas-ejb3-files-to-place-in-deploy-unclustered.txt	2008-11-27 16:31:47 UTC (rev 81740)
+++ projects/ejb3/trunk/installer/src/main/resources/conf/jbossas-ejb3-files-to-place-in-deploy-unclustered.txt	2008-11-27 16:52:36 UTC (rev 81741)
@@ -1,4 +1,3 @@
 ejb3-connectors-service.xml
-ejb3-container-jboss-beans.xml
 ejb3-interceptors-aop.xml
-ejb3-timer-service.xml
\ No newline at end of file
+ejb3-timer-service.xml