Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x 811ef5fc4 -> 797bbbce5
  refs/heads/camel-2.17.x e9d9526bd -> ff92795ef
  refs/heads/master 2d4194852 -> 8c9018522


Fix CAMEL-10253: Add check on null


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3007d546
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3007d546
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3007d546

Branch: refs/heads/master
Commit: 3007d546431dd8dd9d422dac44d53b701c2fd46a
Parents: 2d41948
Author: Michael Frankfurter <mic...@micfra.net>
Authored: Sun Aug 21 11:50:57 2016 +0200
Committer: Michael Frankfurter <mic...@micfra.net>
Committed: Sun Aug 21 11:50:57 2016 +0200

----------------------------------------------------------------------
 .../org/apache/camel/processor/ThrowExceptionProcessor.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/3007d546/camel-core/src/main/java/org/apache/camel/processor/ThrowExceptionProcessor.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/main/java/org/apache/camel/processor/ThrowExceptionProcessor.java
 
b/camel-core/src/main/java/org/apache/camel/processor/ThrowExceptionProcessor.java
index 931e064..08f1dc1 100644
--- 
a/camel-core/src/main/java/org/apache/camel/processor/ThrowExceptionProcessor.java
+++ 
b/camel-core/src/main/java/org/apache/camel/processor/ThrowExceptionProcessor.java
@@ -80,7 +80,8 @@ public class ThrowExceptionProcessor extends ServiceSupport 
implements AsyncProc
     }
 
     public String getTraceLabel() {
-        return "throwException[" + exception.getClass().getSimpleName() + "]";
+        String className = this.exception == null ? this.type.getSimpleName() 
: this.exception.getClass().getSimpleName();
+        return "throwException[" + className + "]";
     }
 
     public String getId() {
@@ -128,4 +129,4 @@ public class ThrowExceptionProcessor extends ServiceSupport 
implements AsyncProc
     protected void doStop() throws Exception {
         // noop
     }
-}
\ No newline at end of file
+}

Reply via email to