Return-Path: Delivered-To: apmail-struts-commits-archive@locus.apache.org Received: (qmail 18336 invoked from network); 28 Jul 2008 13:24:21 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 28 Jul 2008 13:24:21 -0000 Received: (qmail 23797 invoked by uid 500); 28 Jul 2008 13:24:20 -0000 Delivered-To: apmail-struts-commits-archive@struts.apache.org Received: (qmail 23770 invoked by uid 500); 28 Jul 2008 13:24:20 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 23761 invoked by uid 99); 28 Jul 2008 13:24:20 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Jul 2008 06:24:20 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Jul 2008 13:23:33 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BEEA9238889C; Mon, 28 Jul 2008 06:23:59 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r680345 - /struts/struts1/trunk/core/src/main/java/org/apache/struts/action/RequestProcessor.java Date: Mon, 28 Jul 2008 13:23:58 -0000 To: commits@struts.apache.org From: niallp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080728132359.BEEA9238889C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: niallp Date: Mon Jul 28 06:23:57 2008 New Revision: 680345 URL: http://svn.apache.org/viewvc?rev=680345&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/trunk/core/src/main/java/org/apache/struts/action/RequestProcessor.java Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/action/RequestProcessor.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/action/RequestProcessor.java?rev=680345&r1=680344&r2=680345&view=diff ============================================================================== --- struts/struts1/trunk/core/src/main/java/org/apache/struts/action/RequestProcessor.java (original) +++ struts/struts1/trunk/core/src/main/java/org/apache/struts/action/RequestProcessor.java Mon Jul 28 06:23:57 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);