You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2021/12/14 13:25:26 UTC
[camel] 05/07: Fixed NPE in ManagedLog
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8ca47d2a6db29424682c152483caa5aca2228012
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Dec 14 14:09:21 2021 +0100
Fixed NPE in ManagedLog
---
.../src/main/java/org/apache/camel/processor/LogProcessor.java | 4 ++++
.../src/main/java/org/apache/camel/management/mbean/ManagedLog.java | 6 +++++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/LogProcessor.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/LogProcessor.java
index f56eead3..411794e 100644
--- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/LogProcessor.java
+++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/LogProcessor.java
@@ -139,6 +139,10 @@ public class LogProcessor extends AsyncProcessorSupport implements Traceable, Id
this.routeId = routeId;
}
+ public String getMessage() {
+ return message;
+ }
+
public Expression getExpression() {
return expression;
}
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedLog.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedLog.java
index 5602d84..bce924c 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedLog.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedLog.java
@@ -35,7 +35,11 @@ public class ManagedLog extends ManagedProcessor implements ManagedLogMBean {
@Override
public String getMessage() {
- return processor.getExpression().toString();
+ if (processor.getExpression() != null) {
+ return processor.getExpression().toString();
+ } else {
+ return processor.getMessage();
+ }
}
@Override