This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0d0ff4443b4ccfff46145b21ae0ed9ee2344c097
Author: Mehran Hassani <m_ass...@encs.concordia.ca>
AuthorDate: Wed Nov 15 11:40:56 2017 -0500
CAMEL-12004 Add isDebugEnabled() guard for debug level logs
---
.../src/test/java/org/apache/camel/LanguageTestSupport.java | 5 +++--
.../camel/component/github/consumer/CommitConsumerTest.java | 4 +++-
.../org/apache/camel/component/jms/reply/QueueReplyManager.java | 4 +++-
.../java/org/apache/camel/spring/spi/TransactionErrorHandler.java | 2 +-
.../java/org/apache/camel/test/junit4/LanguageTestSupport.java | 5 +++--
.../main/java/org/apache/camel/testng/LanguageTestSupport.java | 5 +++--
.../src/main/java/org/apache/camel/maven/RunMojo.java | 8 ++++++--
.../org/apache/camel/maven/packaging/PackageDataFormatMojo.java | 5 +++--
.../main/java/org/apache/camel/maven/packaging/PackageHelper.java | 4 +++-
.../org/apache/camel/maven/packaging/PackageLanguageMojo.java | 5 +++--
.../org/apache/camel/maven/packaging/SpringBootStarterMojo.java | 6 +++---
.../src/main/java/org/apache/camel/guice/maven/RunMojo.java | 4 +++-
12 files changed, 37 insertions(+), 20 deletions(-)
diff --git a/camel-core/src/test/java/org/apache/camel/LanguageTestSupport.java
b/camel-core/src/test/java/org/apache/camel/LanguageTestSupport.java
index f341dbb..8aaf2b4 100644
--- a/camel-core/src/test/java/org/apache/camel/LanguageTestSupport.java
+++ b/camel-core/src/test/java/org/apache/camel/LanguageTestSupport.java
@@ -94,8 +94,9 @@ public abstract class LanguageTestSupport extends
ExchangeTestSupport {
} else {
value = expression.evaluate(exchange, Object.class);
}
-
- log.debug("Evaluated expression: {} on exchange: {} result: {}",
expression, exchange, value);
+ if (log.isDebugEnabled()) {
+ log.debug("Evaluated expression: {} on exchange: {} result: {}",
expression, exchange, value);
+ }
return value;
}
diff --git
a/components/camel-github/src/test/java/org/apache/camel/component/github/consumer/CommitConsumerTest.java
b/components/camel-github/src/test/java/org/apache/camel/component/github/consumer/CommitConsumerTest.java
index aa25245..746422b 100644
---
a/components/camel-github/src/test/java/org/apache/camel/component/github/consumer/CommitConsumerTest.java
+++
b/components/camel-github/src/test/java/org/apache/camel/component/github/consumer/CommitConsumerTest.java
@@ -60,7 +60,9 @@ public class CommitConsumerTest extends
GitHubComponentTestBase {
Message in = exchange.getIn();
RepositoryCommit commit = (RepositoryCommit) in.getBody();
User author = commit.getAuthor();
- log.debug("Got commit with author: " + author.getLogin() + ": " +
author.getHtmlUrl() + " SHA " + commit.getSha());
+ if (log.isDebugEnabled()) {
+ log.debug("Got commit with author: " + author.getLogin() + ":
" + author.getHtmlUrl() + " SHA " + commit.getSha());
+ }
}
}
}
diff --git
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/QueueReplyManager.java
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/QueueReplyManager.java
index 02a6480..7d15be2 100644
---
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/QueueReplyManager.java
+++
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/QueueReplyManager.java
@@ -131,7 +131,9 @@ public class QueueReplyManager extends ReplyManagerSupport {
answer = new SharedQueueMessageListenerContainer(endpoint,
fixedMessageSelector);
// must use cache level consumer for fixed message selector
answer.setCacheLevel(DefaultMessageListenerContainer.CACHE_CONSUMER);
- log.debug("Using shared queue: " + endpoint.getReplyTo() + "
with fixed message selector [" + fixedMessageSelector + "] as reply listener: "
+ answer);
+ if (log.isDebugEnabled()) {
+ log.debug("Using shared queue: " + endpoint.getReplyTo() +
" with fixed message selector [" + fixedMessageSelector + "] as reply listener:
" + answer);
+ }
} else {
// use a dynamic message selector which will select the
message we want to receive as reply
dynamicMessageSelector = new
MessageSelectorCreator(correlation);
diff --git
a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java
b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java
index 653ea84..f10aeef 100644
---
a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java
+++
b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java
@@ -154,7 +154,7 @@ public class TransactionErrorHandler extends
RedeliveryErrorHandler {
if (log.isDebugEnabled()) {
// log exception if there was a cause exception so we have the
stack trace
Exception cause = exchange.getException();
- if (cause != null) {
+ if (cause != null && log.isDebugEnabled()) {
log.debug("Transaction rollback (" + transactionKey + ")
redelivered(" + redelivered + ") for "
+ ids + " due exchange was marked for rollbackOnlyLast
and caught: ", cause);
} else {
diff --git
a/components/camel-test/src/main/java/org/apache/camel/test/junit4/LanguageTestSupport.java
b/components/camel-test/src/main/java/org/apache/camel/test/junit4/LanguageTestSupport.java
index 185a2c1..1b5e236 100644
---
a/components/camel-test/src/main/java/org/apache/camel/test/junit4/LanguageTestSupport.java
+++
b/components/camel-test/src/main/java/org/apache/camel/test/junit4/LanguageTestSupport.java
@@ -85,8 +85,9 @@ public abstract class LanguageTestSupport extends
ExchangeTestSupport {
} else {
value = expression.evaluate(exchange, Object.class);
}
-
- log.debug("Evaluated expression: " + expression + " on exchange: " +
exchange + " result: " + value);
+ if (log.isDebugEnabled()) {
+ log.debug("Evaluated expression: " + expression + " on exchange: "
+ exchange + " result: " + value);
+ }
assertTrue("Expression: " + expression + " on Exchange: " + exchange,
expectedValue.equals(value) ||
orThisExpectedValue.equals(value));
diff --git
a/components/camel-testng/src/main/java/org/apache/camel/testng/LanguageTestSupport.java
b/components/camel-testng/src/main/java/org/apache/camel/testng/LanguageTestSupport.java
index 1b80036..20f63b8 100644
---
a/components/camel-testng/src/main/java/org/apache/camel/testng/LanguageTestSupport.java
+++
b/components/camel-testng/src/main/java/org/apache/camel/testng/LanguageTestSupport.java
@@ -85,8 +85,9 @@ public abstract class LanguageTestSupport extends
ExchangeTestSupport {
} else {
value = expression.evaluate(exchange, Object.class);
}
-
- log.debug("Evaluated expression: " + expression + " on exchange: " +
exchange + " result: " + value);
+ if (log.isDebugEnabled()) {
+ log.debug("Evaluated expression: " + expression + " on exchange: "
+ exchange + " result: " + value);
+ }
assertTrue(expectedValue.equals(value) ||
orThisExpectedValue.equals(value), "Expression: " + expression + " on Exchange:
" + exchange);
}
diff --git
a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
index 79ca2e0..b2c7508 100644
---
a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
+++
b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
@@ -697,8 +697,10 @@ public class RunMojo extends AbstractExecMojo {
// even log in future
Thread[] threadsArray = new Thread[1];
threadGroup.enumerate(threadsArray);
- getLog().debug("strange; " + activeCount + " thread(s) still
active in the group "
+ if (getLog().isDebugEnabled()) {
+ getLog().debug("strange; " + activeCount + " thread(s)
still active in the group "
+ threadGroup + " such as " +
threadsArray[0]);
+ }
}
}
}
@@ -806,7 +808,9 @@ public class RunMojo extends AbstractExecMojo {
// we must skip org.osgi.core, otherwise we get a
// java.lang.NoClassDefFoundError: org.osgi.vendor.framework
property not set
if (classPathElement.getArtifactId().equals("org.osgi.core")) {
- getLog().debug("Skipping org.osgi.core -> " +
classPathElement.getGroupId() + "/" + classPathElement.getArtifactId() + "/" +
classPathElement.getVersion());
+ if (getLog().isDebugEnabled()) {
+ getLog().debug("Skipping org.osgi.core -> " +
classPathElement.getGroupId() + "/" + classPathElement.getArtifactId() + "/" +
classPathElement.getVersion());
+ }
continue;
}
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
index 1b8955d..8267a53 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
@@ -190,8 +190,9 @@ public class PackageDataFormatMojo extends AbstractMojo {
OutputStream fos =
buildContext.newFileOutputStream(out);
fos.write(schema.getBytes());
fos.close();
-
- log.debug("Generated " + out + " containing JSon
schema for " + name + " data format");
+ if (log.isDebugEnabled()) {
+ log.debug("Generated " + out + " containing
JSon schema for " + name + " data format");
+ }
}
}
}
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageHelper.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageHelper.java
index 5eb94c5..36418a0 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageHelper.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageHelper.java
@@ -47,7 +47,9 @@ public final class PackageHelper {
file = new File(r.getDirectory().substring(baseDir.length() +
1));
}
String path = file.getPath() + "/" + suffix;
- log.debug("checking if " + path + " (" + r.getDirectory() + "/" +
suffix + ") has changed.");
+ if (log.isDebugEnabled()) {
+ log.debug("checking if " + path + " (" + r.getDirectory() +
"/" + suffix + ") has changed.");
+ }
if (buildContext.hasDelta(path)) {
log.debug("Indeed " + suffix + " has changed.");
return true;
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java
index 29c2fc2..86c4005 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java
@@ -224,8 +224,9 @@ public class PackageLanguageMojo extends AbstractMojo {
fos.close();
buildContext.refresh(out);
-
- log.debug("Generated " + out + " containing JSon
schema for " + name + " language");
+ if (log.isDebugEnabled()) {
+ log.debug("Generated " + out + " containing
JSon schema for " + name + " language");
+ }
}
}
}
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java
index ac480d6..7b4bb84 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java
@@ -395,9 +395,9 @@ public class SpringBootStarterMojo extends AbstractMojo {
List<DependencyNode> nodes = visitor.getNodes();
for (DependencyNode dependencyNode : nodes) {
Artifact artifact = dependencyNode.getArtifact();
-
- getLog().debug("Found dependency node: " + artifact.getGroupId() +
":" + artifact.getArtifactId() + ":" + artifact.getVersion() + " - scope=" +
artifact.getScope());
-
+ if (getLog().isDebugEnabled()) {
+ getLog().debug("Found dependency node: " +
artifact.getGroupId() + ":" + artifact.getArtifactId() + ":" +
artifact.getVersion() + " - scope=" + artifact.getScope());
+ }
if (!Artifact.SCOPE_TEST.equals(artifact.getScope()) &&
!Artifact.SCOPE_PROVIDED.equals(artifact.getScope())) {
String canonicalName = artifact.getGroupId() + ":" +
artifact.getArtifactId();
if (artifacts.contains(canonicalName)) {
diff --git
a/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
b/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
index f092d05..9717366 100644
---
a/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
+++
b/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
@@ -513,8 +513,10 @@ public class RunMojo extends AbstractExecMojo {
// even log in future
Thread[] threadsArray = new Thread[1];
threadGroup.enumerate(threadsArray);
- getLog().debug("strange; " + activeCount + " thread(s) still
active in the group "
+ if (getLog().isDebugEnabled()){
+ getLog().debug("strange; " + activeCount + " thread(s)
still active in the group "
+ threadGroup + " such as " +
threadsArray[0]);
+ }
}
}
}
--
To stop receiving notification emails like this one, please contact
"commits@camel.apache.org" <commits@camel.apache.org>.
