svn commit: r680350 - /struts/struts1/branches/STRUTS_1_3_BRANCH/core/src/main/java/org/apache/struts/action/RequestProcessor.java

[niallp]

Author: niallp
Date: Mon Jul 28 06:32:29 2008
New Revision: 680350

URL: http://svn.apache.org/viewvc?rev=680350&view=rev
Log:
STR-3161 Servlet not injected into newly created action in higly concurrent env 
- thanks to Bartek Wasko for the patch

Modified:
    
struts/struts1/branches/STRUTS_1_3_BRANCH/core/src/main/java/org/apache/struts/action/RequestProcessor.java

Modified: 
struts/struts1/branches/STRUTS_1_3_BRANCH/core/src/main/java/org/apache/struts/action/RequestProcessor.java
URL: 
http://svn.apache.org/viewvc/struts/struts1/branches/STRUTS_1_3_BRANCH/core/src/main/java/org/apache/struts/action/RequestProcessor.java?rev=680350&r1=680349&r2=680350&view=diff
==============================================================================
--- 
struts/struts1/branches/STRUTS_1_3_BRANCH/core/src/main/java/org/apache/struts/action/RequestProcessor.java
 (original)
+++ 
struts/struts1/branches/STRUTS_1_3_BRANCH/core/src/main/java/org/apache/struts/action/RequestProcessor.java
 Mon Jul 28 06:32:29 2008
@@ -293,10 +293,10 @@
             }
 
             actions.put(className, instance);
-        }
 
-        if (instance.getServlet() == null) {
-            instance.setServlet(this.servlet);
+            if (instance.getServlet() == null) {
+                instance.setServlet(this.servlet);
+            }
         }
 
         return (instance);