You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by db...@apache.org on 2005/11/23 09:35:27 UTC
svn commit: r348397 -
/geronimo/gbuild/trunk/gbuild-agent/src/main/java/org/apache/geronimo/gbuild/agent/StringTemplate.java
Author: dblevins
Date: Wed Nov 23 00:35:23 2005
New Revision: 348397
URL: http://svn.apache.org/viewcvs?rev=348397&view=rev
Log:
Use toString on object. Don't choke if entry doesn't exist
Modified:
geronimo/gbuild/trunk/gbuild-agent/src/main/java/org/apache/geronimo/gbuild/agent/StringTemplate.java
Modified: geronimo/gbuild/trunk/gbuild-agent/src/main/java/org/apache/geronimo/gbuild/agent/StringTemplate.java
URL: http://svn.apache.org/viewcvs/geronimo/gbuild/trunk/gbuild-agent/src/main/java/org/apache/geronimo/gbuild/agent/StringTemplate.java?rev=348397&r1=348396&r2=348397&view=diff
==============================================================================
--- geronimo/gbuild/trunk/gbuild-agent/src/main/java/org/apache/geronimo/gbuild/agent/StringTemplate.java (original)
+++ geronimo/gbuild/trunk/gbuild-agent/src/main/java/org/apache/geronimo/gbuild/agent/StringTemplate.java Wed Nov 23 00:35:23 2005
@@ -54,7 +54,10 @@
synchronized (context) {
for (int i = 0; i < tokens.length; i++) {
Matcher matcher = patterns[i].matcher(data);
- data = matcher.replaceAll((String) context.get(tokens[i]));
+ Object object = context.get(tokens[i]);
+ if (object != null){
+ data = matcher.replaceAll(object.toString());
+ }
}
}
} catch (Exception e) {