felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pde...@apache.org
Subject svn commit: r1640839 - in /felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm: context/AbstractDependency.java impl/ComponentImpl.java impl/FilterComponent.java impl/ServiceDependencyImpl.java
Date Thu, 20 Nov 2014 23:48:32 GMT
Author: pderop
Date: Thu Nov 20 23:48:32 2014
New Revision: 1640839

URL: http://svn.apache.org/r1640839
Log:
javadoc; removed unnecessary synchronized methods.

Modified:
    felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/context/AbstractDependency.java
    felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ComponentImpl.java
    felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/FilterComponent.java
    felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ServiceDependencyImpl.java

Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/context/AbstractDependency.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/context/AbstractDependency.java?rev=1640839&r1=1640838&r2=1640839&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/context/AbstractDependency.java
(original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/context/AbstractDependency.java
Thu Nov 20 23:48:32 2014
@@ -285,7 +285,7 @@ public abstract class AbstractDependency
     public abstract Class<?> getAutoConfigType();
 
     /**
-     * TODO move this method elsewhere, to DependencyBase for example.
+     * Get the highest ranked available dependency service, or null.
      */
     @Override
     public Event getService() {

Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ComponentImpl.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ComponentImpl.java?rev=1640839&r1=1640838&r2=1640839&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ComponentImpl.java
(original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ComponentImpl.java
Thu Nov 20 23:48:32 2014
@@ -1065,7 +1065,7 @@ public class ComponentImpl implements Co
 	    return this;
 	}
 	
-    public synchronized Component setCallbacks(Object instance, String init, String start,
String stop, String destroy) {
+    public Component setCallbacks(Object instance, String init, String start, String stop,
String destroy) {
 	    ensureNotActive();
         m_callbackInstance = instance;
         m_callbackInit = init;
@@ -1260,7 +1260,7 @@ public class ComponentImpl implements Co
         }
     }
     
-    public synchronized String[] getServices() {
+    public String[] getServices() {
         if (m_serviceName instanceof String[]) {
             return (String[]) m_serviceName;
         } else if (m_serviceName instanceof String) {

Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/FilterComponent.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/FilterComponent.java?rev=1640839&r1=1640838&r2=1640839&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/FilterComponent.java
(original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/FilterComponent.java
Thu Nov 20 23:48:32 2014
@@ -197,7 +197,7 @@ public class FilterComponent implements 
     }
 
     @SuppressWarnings("unchecked")
-    public synchronized Component setInterface(String[] serviceInterfaces, Dictionary<String,
?> properties) {
+    public Component setInterface(String[] serviceInterfaces, Dictionary<String, ?>
properties) {
         m_component.ensureNotActive();
         if (serviceInterfaces != null) {
             m_serviceInterfaces = new String[serviceInterfaces.length];

Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ServiceDependencyImpl.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ServiceDependencyImpl.java?rev=1640839&r1=1640838&r2=1640839&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ServiceDependencyImpl.java
(original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ServiceDependencyImpl.java
Thu Nov 20 23:48:32 2014
@@ -308,7 +308,7 @@ public class ServiceDependencyImpl exten
     }
     
     @Override
-    public synchronized String toString() {
+    public String toString() {
         return "ServiceDependency[" + m_trackedServiceName + " " + m_trackedServiceFilterUnmodified
+ "]";
     }
 
@@ -434,9 +434,7 @@ public class ServiceDependencyImpl exten
     private Object getNullObject() {
         if (m_nullObject == null) {
             Class<?> trackedServiceName;
-            synchronized (this) {
-                trackedServiceName = m_trackedServiceName;
-            }
+            trackedServiceName = m_trackedServiceName;
             try {
                 m_nullObject = Proxy.newProxyInstance(trackedServiceName.getClassLoader(),
                     new Class[] { trackedServiceName }, new DefaultNullObject());



Mime
View raw message