Author: wglass
Date: Fri Oct 14 23:37:28 2005
New Revision: 321298
URL: http://svn.apache.org/viewcvs?rev=321298&view=rev
Log:
Protect against NPE. Issue reported and fix provided by Konstantin Pribluda.
VELOCITY-411.
Modified:
jakarta/velocity/core/trunk/src/java/org/apache/velocity/app/event/implement/EscapeReference.java
Modified:
jakarta/velocity/core/trunk/src/java/org/apache/velocity/app/event/implement/EscapeReference.java
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/app/event/implement/EscapeReference.java?rev=321298&r1=321297&r2=321298&view=diff
==============================================================================
---
jakarta/velocity/core/trunk/src/java/org/apache/velocity/app/event/implement/EscapeReference.java
(original)
+++
jakarta/velocity/core/trunk/src/java/org/apache/velocity/app/event/implement/EscapeReference.java
Fri Oct 14 23:37:28 2005
@@ -83,14 +83,25 @@
*/
public Object referenceInsert(String reference, Object value)
{
+ if(value == null)
+ {
+ return value;
+ }
+
if (matchRegExp == null)
+ {
return escape(value);
-
+ }
+
else if (perl.match(matchRegExp,reference))
+ {
return escape(value);
+ }
else
+ {
return value;
+ }
}
/**
@@ -105,7 +116,9 @@
*/
matchRegExp = rs.getConfiguration().getString(getMatchAttribute());
if ((matchRegExp != null) && (matchRegExp.trim().length() == 0))
+ {
matchRegExp = null;
+ }
/**
* Test the regular expression for a well formed pattern
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
