Author: henning
Date: Sat Oct 29 12:13:48 2005
New Revision: 329471
URL: http://svn.apache.org/viewcvs?rev=329471&view=rev
Log:
Add some sanity check for looking into ParseException to avoid NPE.
Modified:
jakarta/velocity/core/trunk/src/java/org/apache/velocity/exception/ParseErrorException.java
Modified:
jakarta/velocity/core/trunk/src/java/org/apache/velocity/exception/ParseErrorException.java
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/exception/ParseErrorException.java?rev=329471&r1=329470&r2=329471&view=diff
==============================================================================
---
jakarta/velocity/core/trunk/src/java/org/apache/velocity/exception/ParseErrorException.java
(original)
+++
jakarta/velocity/core/trunk/src/java/org/apache/velocity/exception/ParseErrorException.java
Sat Oct 29 12:13:48 2005
@@ -36,7 +36,7 @@
/**
* Version Id for serializable
*/
- private static final long serialVersionUID = -6665197935086306473L;
+ private static final long serialVersionUID = -6665197935086306472L;
/**
* The column number of the parsing error, or -1 if not defined.
@@ -85,9 +85,12 @@
else
{
// ugly, ugly, ugly...
- columnNumber = pex.currentToken.next.beginColumn;
- lineNumber = pex.currentToken.next.beginLine;
- templateName = "*unset*";
+
+ if (pex.currentToken != null && pex.currentToken.next != null)
+ {
+ columnNumber = pex.currentToken.next.beginColumn;
+ lineNumber = pex.currentToken.next.beginLine;
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
