summaryrefslogtreecommitdiff
path: root/qpid/java/common/src/main
diff options
context:
space:
mode:
authorKeith Wall <kwall@apache.org>2014-04-21 14:28:29 +0000
committerKeith Wall <kwall@apache.org>2014-04-21 14:28:29 +0000
commitc31c0f812ac7c165c46f3783868f22a90475584d (patch)
tree1250b75be7ba05a5d85e88d08d42e9956421d84d /qpid/java/common/src/main
parent9f70e3f0d1304971bd92e81add63cf22d0657640 (diff)
downloadqpid-python-c31c0f812ac7c165c46f3783868f22a90475584d.tar.gz
QPID-5715: [Java Broker] Add virtual host node to the model and refactor existing broker functionality to conform the new model. Save configuration model version as VHN attribute and refactor the upgraders and configuration recovery.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1588886 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/common/src/main')
-rw-r--r--qpid/java/common/src/main/java/org/apache/qpid/util/Strings.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/util/Strings.java b/qpid/java/common/src/main/java/org/apache/qpid/util/Strings.java
index 3a1a619981..5b544014a3 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/util/Strings.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/util/Strings.java
@@ -227,6 +227,10 @@ public final class Strings
private static final String expand(String input, Resolver resolver, Stack<String> stack, boolean failOnUnresolved)
{
+ if (input == null)
+ {
+ throw new IllegalArgumentException("Expansion input cannot be null");
+ }
Matcher m = VAR.matcher(input);
StringBuffer result = new StringBuffer();
while (m.find())