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 66CA796DA for ; Mon, 19 Sep 2011 16:31:01 +0000 (UTC) Received: (qmail 42378 invoked by uid 500); 19 Sep 2011 16:31:00 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 42314 invoked by uid 500); 19 Sep 2011 16:31:00 -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 42305 invoked by uid 99); 19 Sep 2011 16:31:00 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Sep 2011 16:31:00 +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; Mon, 19 Sep 2011 16:30:58 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0702323888E4 for ; Mon, 19 Sep 2011 16:30:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1172689 - /tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java Date: Mon, 19 Sep 2011 16:30:36 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20110919163037.0702323888E4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Mon Sep 19 16:30:36 2011 New Revision: 1172689 URL: http://svn.apache.org/viewvc?rev=1172689&view=rev Log: Fix threading issue with changing visibility of methods and fields Modified: tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java Modified: tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java?rev=1172689&r1=1172688&r2=1172689&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java (original) +++ tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java Mon Sep 19 16:30:36 2011 @@ -187,9 +187,11 @@ public class DefaultInstanceManager impl if (entry.getType() == AnnotationCacheEntryType.POST_CONSTRUCT) { Method postConstruct = (Method) entry.getAccessibleObject(); boolean accessibility = postConstruct.isAccessible(); - postConstruct.setAccessible(true); - postConstruct.invoke(instance); - postConstruct.setAccessible(accessibility); + synchronized (postConstruct) { + postConstruct.setAccessible(true); + postConstruct.invoke(instance); + postConstruct.setAccessible(accessibility); + } } } } @@ -229,9 +231,11 @@ public class DefaultInstanceManager impl if (entry.getType() == AnnotationCacheEntryType.PRE_DESTROY) { Method preDestroy = (Method) entry.getAccessibleObject(); boolean accessibility = preDestroy.isAccessible(); - preDestroy.setAccessible(true); - preDestroy.invoke(instance); - preDestroy.setAccessible(accessibility); + synchronized (preDestroy) { + preDestroy.setAccessible(true); + preDestroy.invoke(instance); + preDestroy.setAccessible(accessibility); + } } } } @@ -572,9 +576,11 @@ public class DefaultInstanceManager impl } accessibility = field.isAccessible(); - field.setAccessible(true); - field.set(instance, lookedupResource); - field.setAccessible(accessibility); + synchronized (field) { + field.setAccessible(true); + field.set(instance, lookedupResource); + field.setAccessible(accessibility); + } } /** @@ -614,9 +620,11 @@ public class DefaultInstanceManager impl } accessibility = method.isAccessible(); - method.setAccessible(true); - method.invoke(instance, lookedupResource); - method.setAccessible(accessibility); + synchronized (method) { + method.setAccessible(true); + method.invoke(instance, lookedupResource); + method.setAccessible(accessibility); + } } public static String getName(Method setter) { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org