commit 432faea0237adcd9acafae0c02ef2c136fa1923d
author Paul C. Benedict Jr <pbenedict@apache.org> Fri Dec 19 04:04:25 2008 +0000
committer Paul C. Benedict Jr <pbenedict@apache.org> Fri Dec 19 04:04:25 2008 +0000
tree 3a6e24338b9c1958d5bac3ec5f82ebc59ccecb48
parent 9c5f03176000527594664333f34a11289e65d960

STR-3174: Release context after execution

git-svn-id: https://svn.apache.org/repos/asf/struts/struts1/trunk@727914 13f79535-47bb-0310-9956-ffa450edef68

core/src/main/java/org/apache/struts/chain/ComposableRequestProcessor.java

diff --git a/core/src/main/java/org/apache/struts/chain/ComposableRequestProcessor.java b/core/src/main/java/org/apache/struts/chain/ComposableRequestProcessor.java
index aa4a41c..5cc308f 100644
--- a/core/src/main/java/org/apache/struts/chain/ComposableRequestProcessor.java
+++ b/core/src/main/java/org/apache/struts/chain/ComposableRequestProcessor.java
@@ -284,10 +284,12 @@
         } catch (Exception e) {
             // Execute the exception processing chain??
             throw new ServletException(e);
+        } finally {
+            // Release the context.
+            if (context != null) {
+                context.release();
+            }
         }
-
-        // Release the context.
-        context.release();
     }
 
     /**