summaryrefslogtreecommitdiff
path: root/java/common/src
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
commit34ee1fa2a9793f1cf68f688d85da78e957a7d9e7 (patch)
tree4d17cf5293da3a3df993792871a7dadd4fa06fce /java/common/src
parent77c6253860ff2618c8d532a1e5af6b7a483fb0fa (diff)
downloadqpid-python-34ee1fa2a9793f1cf68f688d85da78e957a7d9e7.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/qpid@1588886 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/common/src')
-rw-r--r--java/common/src/main/java/org/apache/qpid/util/Strings.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/java/common/src/main/java/org/apache/qpid/util/Strings.java b/java/common/src/main/java/org/apache/qpid/util/Strings.java
index 3a1a619981..5b544014a3 100644
--- a/java/common/src/main/java/org/apache/qpid/util/Strings.java
+++ b/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())