felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r910896 - /felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/ServiceImpl.java
Date Wed, 17 Feb 2010 10:20:11 GMT
Author: marrs
Date: Wed Feb 17 10:20:11 2010
New Revision: 910896

URL: http://svn.apache.org/viewvc?rev=910896&view=rev
Log:
only log an error if there is no implementation set AND creating an instance using a factory
did not work

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=910896&r1=910895&r2=910896&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
Wed Feb 17 10:20:11 2010
@@ -690,10 +690,10 @@
     					}
 		        	}
 	        	}
-	        	if (m_implementation == null) {
-                    m_logger.log(Logger.LOG_ERROR, "Implementation cannot be null.");
-	        	}
 	        	if (m_serviceInstance == null) {
+	        	    if (m_implementation == null) {
+	        	        m_logger.log(Logger.LOG_ERROR, "Implementation cannot be null.");
+	        	    }
 	        	    m_serviceInstance = m_implementation;
 	        	}
 	        }



Mime
View raw message