You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2012/04/25 13:53:01 UTC
svn commit: r1330221 -
/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/StringTemplate.java
Author: dblevins
Date: Wed Apr 25 11:53:01 2012
New Revision: 1330221
URL: http://svn.apache.org/viewvc?rev=1330221&view=rev
Log:
Improved exception handling
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/StringTemplate.java
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/StringTemplate.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/StringTemplate.java?rev=1330221&r1=1330220&r2=1330221&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/StringTemplate.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/StringTemplate.java Wed Apr 25 11:53:01 2012
@@ -35,6 +35,9 @@ public class StringTemplate {
while (matcher.find()) {
String key = matcher.group(2);
+
+ if (key == null) throw new IllegalStateException("Key is null. Template '" + template + "'");
+
String value = map.get(key);
if (key.toLowerCase().endsWith(".lc")) {
@@ -44,8 +47,9 @@ public class StringTemplate {
} else if (key.toLowerCase().endsWith(".cc")) {
value = Strings.camelCase(map.get(key.substring(0, key.length() - 3)));
}
-
- matcher.appendReplacement(buf, value);
+
+ if (value == null) throw new IllegalStateException("Value is null for key '" + key + "'. Template '" + template + "'. Keys: " + Join.join(", ", map.keySet()));
+ matcher.appendReplacement(buf, value);
}
matcher.appendTail(buf);