Author: pderop
Date: Sun Feb 14 13:17:24 2016
New Revision: 1730332
URL: http://svn.apache.org/viewvc?rev=1730332&view=rev
Log:
FELIX-5187: Removed unnecessary null-check when using the logger.
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ConfigurationDependencyImpl.java
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ConfigurationDependencyImpl.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ConfigurationDependencyImpl.java?rev=1730332&r1=1730331&r2=1730332&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ConfigurationDependencyImpl.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ConfigurationDependencyImpl.java
Sun Feb 14 13:17:24 2016
@@ -429,7 +429,7 @@ public class ConfigurationDependencyImpl
if (! callbackFound) {
String[] instanceClasses = Stream.of(instances).map(c ->
c.getClass().getName()).toArray(String[]::new);
- log("\"" + m_add + "\" configuration callback not found in any
of the component classes: " + Arrays.toString(instanceClasses));
+ m_logger.log(Logger.LOG_ERROR, "\"" + m_add + "\"
configuration callback not found in any of the component classes: " +
Arrays.toString(instanceClasses));
}
}
}
@@ -439,23 +439,8 @@ public class ConfigurationDependencyImpl
m_metaType = new MetaTypeProviderImpl(m_pid, m_context, m_logger,
this, null);
}
}
-
- private void log(String msg) {
- if (m_logger != null) {
- m_logger.log(Logger.LOG_ERROR, msg);
- } else {
- System.err.println(msg);
- }
- }
-
+
private void logConfigurationException(ConfigurationException e) {
- if (m_logger != null) {
- m_logger.log(Logger.LOG_ERROR, "Got exception while handling
configuration update for pid " + m_pid, e);
- } else {
- System.err.println("Got exception while handling configuration
update for pid " + m_pid);
- if (e != null) {
- e.printStackTrace();
- }
- }
+ m_logger.log(Logger.LOG_ERROR, "Got exception while handling
configuration update for pid " + m_pid, e);
}
}
