Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 49948 invoked from network); 3 Jun 2008 12:20:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 3 Jun 2008 12:20:58 -0000 Received: (qmail 42071 invoked by uid 500); 3 Jun 2008 12:21:00 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 41929 invoked by uid 500); 3 Jun 2008 12:21:00 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 41920 invoked by uid 500); 3 Jun 2008 12:21:00 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 41917 invoked by uid 99); 3 Jun 2008 12:21:00 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Jun 2008 05:21:00 -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; Tue, 03 Jun 2008 12:20:19 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 92DE32388A26; Tue, 3 Jun 2008 05:20:36 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r662761 - /webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/extensions/osgi/ServiceRegistry.java Date: Tue, 03 Jun 2008 12:20:36 -0000 To: axis2-cvs@ws.apache.org From: dims@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080603122036.92DE32388A26@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dims Date: Tue Jun 3 05:20:36 2008 New Revision: 662761 URL: http://svn.apache.org/viewvc?rev=662761&view=rev Log: use concurrent hash map to prevent a race condition when shutting down equinox Modified: webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/extensions/osgi/ServiceRegistry.java Modified: webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/extensions/osgi/ServiceRegistry.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/extensions/osgi/ServiceRegistry.java?rev=662761&r1=662760&r2=662761&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/extensions/osgi/ServiceRegistry.java (original) +++ webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/extensions/osgi/ServiceRegistry.java Tue Jun 3 05:20:36 2008 @@ -40,11 +40,12 @@ import java.util.Enumeration; import java.util.HashMap; import java.util.Iterator; +import java.util.concurrent.ConcurrentHashMap; public class ServiceRegistry extends JAXWSDeployer { private OSGiAxis2Servlet servlet; private Logger logger; - private HashMap services = new HashMap(); + private ConcurrentHashMap services = new ConcurrentHashMap(); private boolean isInited = false; public ServiceRegistry(OSGiAxis2Servlet servlet, Logger logger) {