Author: pderop
Date: Thu Nov 10 17:54:54 2016
New Revision: 1769169
URL: http://svn.apache.org/viewvc?rev=1769169&view=rev
Log:
FELIX-5405: Do not have org.apache.felix.dm.Logger invoke toString() of message
parameters when enabled log level is not high enough.
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/Logger.java
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/Logger.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/Logger.java?rev=1769169&r1=1769168&r2=1769169&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/Logger.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/Logger.java
Thu Nov 10 17:54:54 2016
@@ -269,19 +269,27 @@ public class Logger implements ServiceLi
// --------------- Convenient helper log methods
--------------------------------------------
public void err(String format, Object... params) {
- log(LogService.LOG_ERROR, String.format(format, params));
+ if (m_enabledLevel >= LOG_ERROR) {
+ log(LogService.LOG_ERROR, String.format(format, params));
+ }
}
public void err(String format, Throwable err, Object... params) {
- log(LogService.LOG_ERROR, String.format(format, params), err);
+ if (m_enabledLevel >= LOG_ERROR) {
+ log(LogService.LOG_ERROR, String.format(format, params), err);
+ }
}
public void warn(String format, Object... params) {
- log(LogService.LOG_WARNING, String.format(format, params));
+ if (m_enabledLevel >= LOG_WARNING) {
+ log(LogService.LOG_WARNING, String.format(format, params));
+ }
}
public void warn(String format, Throwable err, Object... params) {
- log(LogService.LOG_WARNING, String.format(format, params), err);
+ if (m_enabledLevel >= LOG_WARNING) {
+ log(LogService.LOG_WARNING, String.format(format, params),
err);
+ }
}
public boolean info() {
@@ -289,11 +297,15 @@ public class Logger implements ServiceLi
}
public void info(String format, Object... params) {
- log(LogService.LOG_INFO, String.format(format, params));
+ if (info()) {
+ log(LogService.LOG_INFO, String.format(format, params));
+ }
}
public void info(String format, Throwable err, Object... params) {
- log(LogService.LOG_INFO, String.format(format, params), err);
+ if (info()) {
+ log(LogService.LOG_INFO, String.format(format, params), err);
+ }
}
public boolean debug() {
@@ -301,10 +313,14 @@ public class Logger implements ServiceLi
}
public void debug(String format, Object... params) {
- log(LogService.LOG_DEBUG, String.format(format, params));
+ if (debug()) {
+ log(LogService.LOG_DEBUG, String.format(format, params));
+ }
}
public void debug(String format, Throwable err, Object... params) {
- log(LogService.LOG_DEBUG, String.format(format, params), err);
+ if (debug()) {
+ log(LogService.LOG_DEBUG, String.format(format, params), err);
+ }
}
}
\ No newline at end of file
