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/08/21 01:36:17 UTC

svn commit: r687507 - /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonInstanceManager.java

Author: dblevins
Date: Wed Aug 20 16:36:17 2008
New Revision: 687507

URL: http://svn.apache.org/viewvc?rev=687507&view=rev
Log:
Don't bother trying to destroy instances that haven't been constructed

Modified:
    openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonInstanceManager.java

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonInstanceManager.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonInstanceManager.java?rev=687507&r1=687506&r2=687507&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonInstanceManager.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonInstanceManager.java Wed Aug 20 16:36:17 2008
@@ -266,6 +266,9 @@
         Data data = (Data) deploymentInfo.getContainerData();
         Instance instance = data.instance;
 
+        // Possible the instance was never created
+        if (instance == null) return;
+
         try {
             callContext.setCurrentOperation(Operation.PRE_DESTROY);
             callContext.setCurrentAllowedStates(SingletonContext.getStates());