svn commit: r1612317 - /tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessContainer.java

[andygumbrecht]

Author: andygumbrecht
Date: Mon Jul 21 15:35:06 2014
New Revision: 1612317

URL: http://svn.apache.org/r1612317
Log:
Revert experiment.

Modified:
    
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessContainer.java

Modified: 
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessContainer.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessContainer.java?rev=1612317&r1=1612316&r2=1612317&view=diff
==============================================================================
--- 
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessContainer.java
 (original)
+++ 
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessContainer.java
 Mon Jul 21 15:35:06 2014
@@ -159,7 +159,6 @@ public class StatelessContainer implemen
         final ThreadContext callContext = new ThreadContext(beanContext, 
primKey);
         final ThreadContext oldCallContext = ThreadContext.enter(callContext);
 
-        OpenEJBException oejbe = null;
         Instance bean = null;
         final CurrentCreationalContext currentCreationalContext = 
beanContext.get(CurrentCreationalContext.class);
 
@@ -193,28 +192,20 @@ public class StatelessContainer implemen
                 currentCreationalContext.set(bean.creationalContext);
             }
             return _invoke(callMethod, runMethod, args, bean, callContext, 
type);
-        } catch (final OpenEJBException t) {
-            oejbe = t;
-        }
-
-        if (bean != null) {
-            if (callContext.isDiscardInstance()) {
-                this.instanceManager.discardInstance(callContext, bean);
-            } else {
-                this.instanceManager.poolInstance(callContext, bean);
+        } finally {
+            if (bean != null) {
+                if (callContext.isDiscardInstance()) {
+                    this.instanceManager.discardInstance(callContext, bean);
+                } else {
+                    this.instanceManager.poolInstance(callContext, bean);
+                }
             }
-        }
-
-        ThreadContext.exit(oldCallContext);
 
-        if (currentCreationalContext != null) {
-            currentCreationalContext.remove();
-        }
+            ThreadContext.exit(oldCallContext);
 
-        if (null != oejbe) {
-            throw oejbe;
-        } else {
-            return null;
+            if (currentCreationalContext != null) {
+                currentCreationalContext.remove();
+            }
         }
     }