You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2017/02/08 12:37:26 UTC
[2/2] camel git commit: Fix tests failures
Fix tests failures
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/47163cd1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/47163cd1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/47163cd1
Branch: refs/heads/master
Commit: 47163cd1b58b51ba2a41077ddf6b3905f06276f2
Parents: a9095b9
Author: lburgazzoli <lb...@gmail.com>
Authored: Wed Feb 8 13:14:51 2017 +0100
Committer: lburgazzoli <lb...@gmail.com>
Committed: Wed Feb 8 13:36:57 2017 +0100
----------------------------------------------------------------------
.../camel/component/jms/JmsComponent.java | 31 +++++++++++---------
1 file changed, 17 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/47163cd1/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
index 3b0b487..dbe266a 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
@@ -1161,20 +1161,23 @@ public class JmsComponent extends HeaderFilterStrategyComponent implements Appli
boolean pubSubDomain = false;
boolean tempDestination = false;
- if (remaining.startsWith(JmsConfiguration.QUEUE_PREFIX)) {
- pubSubDomain = false;
- remaining = removeStartingCharacters(remaining.substring(JmsConfiguration.QUEUE_PREFIX.length()), '/');
- } else if (remaining.startsWith(JmsConfiguration.TOPIC_PREFIX)) {
- pubSubDomain = true;
- remaining = removeStartingCharacters(remaining.substring(JmsConfiguration.TOPIC_PREFIX.length()), '/');
- } else if (remaining.startsWith(JmsConfiguration.TEMP_QUEUE_PREFIX)) {
- pubSubDomain = false;
- tempDestination = true;
- remaining = removeStartingCharacters(remaining.substring(JmsConfiguration.TEMP_QUEUE_PREFIX.length()), '/');
- } else if (remaining.startsWith(JmsConfiguration.TEMP_TOPIC_PREFIX)) {
- pubSubDomain = true;
- tempDestination = true;
- remaining = removeStartingCharacters(remaining.substring(JmsConfiguration.TEMP_TOPIC_PREFIX.length()), '/');
+
+ if (ObjectHelper.isNotEmpty(remaining)) {
+ if (remaining.startsWith(JmsConfiguration.QUEUE_PREFIX)) {
+ pubSubDomain = false;
+ remaining = removeStartingCharacters(remaining.substring(JmsConfiguration.QUEUE_PREFIX.length()), '/');
+ } else if (remaining.startsWith(JmsConfiguration.TOPIC_PREFIX)) {
+ pubSubDomain = true;
+ remaining = removeStartingCharacters(remaining.substring(JmsConfiguration.TOPIC_PREFIX.length()), '/');
+ } else if (remaining.startsWith(JmsConfiguration.TEMP_QUEUE_PREFIX)) {
+ pubSubDomain = false;
+ tempDestination = true;
+ remaining = removeStartingCharacters(remaining.substring(JmsConfiguration.TEMP_QUEUE_PREFIX.length()), '/');
+ } else if (remaining.startsWith(JmsConfiguration.TEMP_TOPIC_PREFIX)) {
+ pubSubDomain = true;
+ tempDestination = true;
+ remaining = removeStartingCharacters(remaining.substring(JmsConfiguration.TEMP_TOPIC_PREFIX.length()), '/');
+ }
}
final String subject = convertPathToActualDestination(remaining, parameters);