Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9DA356399 for ; Sat, 2 Jul 2011 12:01:54 +0000 (UTC) Received: (qmail 97862 invoked by uid 500); 2 Jul 2011 12:01:53 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 97574 invoked by uid 500); 2 Jul 2011 12:01:52 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 97565 invoked by uid 99); 2 Jul 2011 12:01:52 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 02 Jul 2011 12:01:52 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Sat, 02 Jul 2011 12:01:51 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 6857723888CE for ; Sat, 2 Jul 2011 12:01:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1142209 - /tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java Date: Sat, 02 Jul 2011 12:01:31 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110702120131.6857723888CE@eris.apache.org> Author: markt Date: Sat Jul 2 12:01:30 2011 New Revision: 1142209 URL: http://svn.apache.org/viewvc?rev=1142209&view=rev Log: Only add instance if it has just been created. Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=1142209&r1=1142208&r2=1142209&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java (original) +++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java Sat Jul 2 12:01:30 2011 @@ -845,11 +845,13 @@ public class StandardWrapper extends Con } if (singleThreadModel) { - // Have to do this outside of the sync above to prevent a - // possible deadlock - synchronized (instancePool) { - instancePool.push(instance); - nInstances++; + if (newInstance) { + // Have to do this outside of the sync above to prevent a + // possible deadlock + synchronized (instancePool) { + instancePool.push(instance); + nInstances++; + } } } else { if (log.isTraceEnabled()) --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org