felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r425357 - /incubator/felix/trunk/org.apache.felix.dependencymanager/src/main/java/org/apache/felix/dependencymanager/ServiceRegistrationImpl.java
Date Tue, 25 Jul 2006 10:10:24 GMT
Author: marrs
Date: Tue Jul 25 03:10:24 2006
New Revision: 425357

URL: http://svn.apache.org/viewvc?rev=425357&view=rev
Log:
Fixed a deadlock that occurred on shutdown of the framework, when an equals() invocation caused
an ensureRegistration() call to wait indefinitely.

Modified:
    incubator/felix/trunk/org.apache.felix.dependencymanager/src/main/java/org/apache/felix/dependencymanager/ServiceRegistrationImpl.java

Modified: incubator/felix/trunk/org.apache.felix.dependencymanager/src/main/java/org/apache/felix/dependencymanager/ServiceRegistrationImpl.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.apache.felix.dependencymanager/src/main/java/org/apache/felix/dependencymanager/ServiceRegistrationImpl.java?rev=425357&r1=425356&r2=425357&view=diff
==============================================================================
--- incubator/felix/trunk/org.apache.felix.dependencymanager/src/main/java/org/apache/felix/dependencymanager/ServiceRegistrationImpl.java
(original)
+++ incubator/felix/trunk/org.apache.felix.dependencymanager/src/main/java/org/apache/felix/dependencymanager/ServiceRegistrationImpl.java
Tue Jul 25 03:10:24 2006
@@ -75,7 +75,7 @@
                 // service registration ready; if not we wait again
             }
         }
-        if (ILLEGAL_STATE.equals(m_registration)) {
+        if (ILLEGAL_STATE == m_registration) {
             throw new IllegalStateException("Service is not registered.");
         }
     }



Mime
View raw message