svn commit: r889174 - /felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/ServiceImpl.java

[marrs]

Author: marrs
Date: Thu Dec 10 10:31:35 2009
New Revision: 889174

URL: http://svn.apache.org/viewvc?rev=889174&view=rev
Log:
corrected the previous patch

Modified:
    
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/ServiceImpl.java

Modified: 
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/ServiceImpl.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/ServiceImpl.java?rev=889174&r1=889173&r2=889174&view=diff
==============================================================================
--- 
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/ServiceImpl.java
 (original)
+++ 
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/ServiceImpl.java
 Thu Dec 10 10:31:35 2009
@@ -421,7 +421,7 @@
 
        public synchronized void setServiceProperties(Dictionary 
serviceProperties) {
            m_serviceProperties = serviceProperties;
-           if (isRegistered() && (m_serviceName != null)) {
+           if (isBound() && (m_serviceName != null)) {
                m_registration.setProperties(calculateServiceProperties());
            }
        }
@@ -1028,6 +1028,14 @@
        synchronized (m_dependencies) {
                state = m_state;
        }
+        return (state.isAllRequiredAvailable());
+    }
+    
+    private boolean isBound() {
+        State state;
+        synchronized (m_dependencies) {
+            state = m_state;
+        }
         return (state.isBound());
     }