felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pde...@apache.org
Subject svn commit: r1523504 - /felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/Logger.java
Date Sun, 15 Sep 2013 21:17:04 GMT
Author: pderop
Date: Sun Sep 15 21:17:04 2013
New Revision: 1523504

URL: http://svn.apache.org/r1523504
Log:
FELIX-4186: Fixed NPE in dependency manager Logger.

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

Modified: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/Logger.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/Logger.java?rev=1523504&r1=1523503&r2=1523504&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/Logger.java
(original)
+++ felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/Logger.java
Sun Sep 15 21:17:04 2013
@@ -195,7 +195,7 @@ public class Logger implements ServiceLi
         }
         // if the current logger is going away, release it and try to
         // find another one
-        else if ((event.getType() == ServiceEvent.UNREGISTERING) && m_logRef.equals(event.getServiceReference()))
{
+        else if ((event.getType() == ServiceEvent.UNREGISTERING) && m_logRef != null
&& m_logRef.equals(event.getServiceReference())) {
             // Unget the service object.
             m_context.ungetService(m_logRef);
             // Try to get an existing log service.



Mime
View raw message