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 2016/08/21 10:45:21 UTC
[1/4] camel git commit: Fix CAMEL-10253: Add check on null
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 <mi...@micfra.net>
Authored: Sun Aug 21 11:50:57 2016 +0200
Committer: Michael Frankfurter <mi...@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
+}
[2/4] camel git commit: Deprecated testng,
use junit instead which wwe maintain much more and works with a lot
more.
Posted by da...@apache.org.
Deprecated testng, use junit instead which wwe maintain much more and works with a lot more.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8c901852
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8c901852
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8c901852
Branch: refs/heads/master
Commit: 8c90185226b19203552d87cef41e5a35945f1f22
Parents: 3007d54
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Aug 21 12:44:29 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Aug 21 12:44:29 2016 +0200
----------------------------------------------------------------------
components-starter/camel-testng-starter/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/8c901852/components-starter/camel-testng-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-testng-starter/pom.xml b/components-starter/camel-testng-starter/pom.xml
index 44104c4..d71f2a5 100644
--- a/components-starter/camel-testng-starter/pom.xml
+++ b/components-starter/camel-testng-starter/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-testng-starter</artifactId>
<packaging>jar</packaging>
- <name>Spring-Boot Starter :: Camel :: TestNG</name>
+ <name>Spring-Boot Starter :: Camel :: TestNG (deprecated)</name>
<description>Spring-Boot Starter for Camel Testing Library using TestNG</description>
<dependencies>
<dependency>
[4/4] camel git commit: Fix CAMEL-10253: Add check on null
Posted by da...@apache.org.
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/797bbbce
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/797bbbce
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/797bbbce
Branch: refs/heads/camel-2.16.x
Commit: 797bbbce5f20c3bbffec4d6162778cab27509637
Parents: 811ef5f
Author: Michael Frankfurter <mi...@micfra.net>
Authored: Sun Aug 21 11:50:57 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Aug 21 12:45:12 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/797bbbce/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
+}
[3/4] camel git commit: Fix CAMEL-10253: Add check on null
Posted by da...@apache.org.
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/ff92795e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ff92795e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ff92795e
Branch: refs/heads/camel-2.17.x
Commit: ff92795ef755e755ef70e2165b80d4b6455d8ea4
Parents: e9d9526
Author: Michael Frankfurter <mi...@micfra.net>
Authored: Sun Aug 21 11:50:57 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Aug 21 12:44: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/ff92795e/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
+}