[jboss-svn-commits] JBL Code SVN: r32706 - labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-api/src/main/java/org/drools/util.

[jboss-svn-commits at lists.jboss.org]

Author: baunax
Date: 2010-05-03 10:12:56 -0400 (Mon, 03 May 2010)
New Revision: 32706

Modified:
   labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-api/src/main/java/org/drools/util/ServiceRegistryImpl.java
Log:
make it thread safe

Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-api/src/main/java/org/drools/util/ServiceRegistryImpl.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-api/src/main/java/org/drools/util/ServiceRegistryImpl.java	2010-05-03 13:27:51 UTC (rev 32705)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-api/src/main/java/org/drools/util/ServiceRegistryImpl.java	2010-05-03 14:12:56 UTC (rev 32706)
@@ -14,23 +14,15 @@
 
 package org.drools.util;
 
-import java.io.IOException;
-import java.util.Dictionary;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.Callable;
 
 import org.drools.KnowledgeBaseFactoryService;
 import org.drools.Service;
-import org.drools.SystemEventListener;
 import org.drools.SystemEventListenerService;
 import org.drools.builder.KnowledgeBuilderFactoryService;
 import org.drools.io.ResourceFactoryService;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
-import org.osgi.service.cm.Configuration;
-import org.osgi.service.cm.ConfigurationAdmin;
-import org.osgi.service.component.ComponentContext;
 
 /**
  * This is an internal class, not for public consumption.
@@ -39,15 +31,12 @@
 public class ServiceRegistryImpl
     implements
     ServiceRegistry {
-    private static ServiceRegistry     instance;
+	private static ServiceRegistry instance = new ServiceRegistryImpl();
 
     private Map<String, Callable< ? >> registry        = new HashMap<String, Callable< ? >>();
     private Map<String, Callable< ? >> defaultServices = new HashMap<String, Callable< ? >>();
 
     public static synchronized ServiceRegistry getInstance() {
-        if ( instance == null ) {
-            instance = new ServiceRegistryImpl();
-        }
         return ServiceRegistryImpl.instance;
     }
 
@@ -58,8 +47,7 @@
     /* (non-Javadoc)
      * @see org.drools.util.internal.ServiceRegistry#registerLocator(java.lang.String, java.util.concurrent.Callable)
      */
-    public synchronized void registerLocator(Class cls,
-                                             Callable cal) {
+	public synchronized void registerLocator(Class cls, Callable cal) {
         this.registry.put( cls.getName(),
                            cal );
     }