svn commit: r1372735 - /sling/trunk/bundles/extensions/adapter/src/main/java/org/apache/sling/adapter/internal/AdapterManagerImpl.java

[cz...@apache.org]

Author: cziegeler
Date: Tue Aug 14 05:49:09 2012
New Revision: 1372735

URL: http://svn.apache.org/viewvc?rev=1372735&view=rev
Log:
SLING-2558 : Potential Deadlocks may be caused by AdapterManager

Modified:
    sling/trunk/bundles/extensions/adapter/src/main/java/org/apache/sling/adapter/internal/AdapterManagerImpl.java

Modified: sling/trunk/bundles/extensions/adapter/src/main/java/org/apache/sling/adapter/internal/AdapterManagerImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/adapter/src/main/java/org/apache/sling/adapter/internal/AdapterManagerImpl.java?rev=1372735&r1=1372734&r2=1372735&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/adapter/src/main/java/org/apache/sling/adapter/internal/AdapterManagerImpl.java (original)
+++ sling/trunk/bundles/extensions/adapter/src/main/java/org/apache/sling/adapter/internal/AdapterManagerImpl.java Tue Aug 14 05:49:09 2012
@@ -70,7 +70,7 @@ import org.slf4j.LoggerFactory;
     cardinality=ReferenceCardinality.OPTIONAL_MULTIPLE, policy=ReferencePolicy.DYNAMIC)
 public class AdapterManagerImpl implements AdapterManager {
 
-    private Logger log = LoggerFactory.getLogger(getClass());
+    private final Logger log = LoggerFactory.getLogger(getClass());
 
     /**
      * The OSGi <code>ComponentContext</code> to retrieve
@@ -83,7 +83,7 @@ public class AdapterManagerImpl implemen
      * the manager has been activated. These bound services will be accessed as
      * soon as the manager is being activated.
      */
-    private List<ServiceReference> boundAdapterFactories = new LinkedList<ServiceReference>();
+    private final List<ServiceReference> boundAdapterFactories = new LinkedList<ServiceReference>();
 
     /**
      * A map of {@link AdapterFactoryDescriptorMap} instances. The map is
@@ -93,7 +93,7 @@ public class AdapterManagerImpl implemen
      *
      * @see AdapterFactoryDescriptorMap
      */
-    private Map<String, AdapterFactoryDescriptorMap> descriptors = new HashMap<String, AdapterFactoryDescriptorMap>();
+    private final Map<String, AdapterFactoryDescriptorMap> descriptors = new HashMap<String, AdapterFactoryDescriptorMap>();
 
     /**
      * Matrix of {@link AdapterFactoryDescriptor} instances primarily indexed by the fully