dlr 01/01/12 12:20:38
Modified: src/java/org/apache/velocity/runtime Runtime.java
Log:
Repositioned the return of the AST in parse() more logically and
downcased the variable name as it is not a constant.
Revision Changes Path
1.82 +4 -4
jakarta-velocity/src/java/org/apache/velocity/runtime/Runtime.java
Index: Runtime.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/Runtime.java,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- Runtime.java 2001/01/12 19:42:36 1.81
+++ Runtime.java 2001/01/12 20:20:38 1.82
@@ -169,7 +169,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Jeff Bowden</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magusson Jr.</a>
- * @version $Id: Runtime.java,v 1.81 2001/01/12 19:42:36 jon Exp $
+ * @version $Id: Runtime.java,v 1.82 2001/01/12 20:20:38 dlr Exp $
*/
public class Runtime implements RuntimeConstants
{
@@ -555,20 +555,20 @@
public static SimpleNode parse(InputStream inputStream, String strTemplateName )
throws ParseException
{
- SimpleNode AST = null;
+ SimpleNode ast = null;
Parser parser = (Parser) parserPool.get();
if (parser != null)
{
try
{
- AST = parser.parse(inputStream, strTemplateName);
- return AST;
+ ast = parser.parse(inputStream, strTemplateName);
}
finally
{
parserPool.put(parser);
}
+ return ast;
}
else
{
- cvs commit: jakarta-velocity/src/java/org/apache/velocity/runtime ... jon
- cvs commit: jakarta-velocity/src/java/org/apache/velocity/runtime ... jon
- cvs commit: jakarta-velocity/src/java/org/apache/velocity/runtime ... jon
- cvs commit: jakarta-velocity/src/java/org/apache/velocity/runtime ... jvanzyl
- cvs commit: jakarta-velocity/src/java/org/apache/velocity/runtime ... jvanzyl
- cvs commit: jakarta-velocity/src/java/org/apache/velocity/runtime ... jvanzyl
- cvs commit: jakarta-velocity/src/java/org/apache/velocity/runtime ... jvanzyl
- cvs commit: jakarta-velocity/src/java/org/apache/velocity/runtime ... jvanzyl
- cvs commit: jakarta-velocity/src/java/org/apache/velocity/runtime ... jvanzyl
- cvs commit: jakarta-velocity/src/java/org/apache/velocity/runtime ... jon
- cvs commit: jakarta-velocity/src/java/org/apache/velocity/runtime ... dlr
- cvs commit: jakarta-velocity/src/java/org/apache/velocity/runtime ... dlr
- cvs commit: jakarta-velocity/src/java/org/apache/velocity/runtime ... geirm
- cvs commit: jakarta-velocity/src/java/org/apache/velocity/runtime ... dlr
- cvs commit: jakarta-velocity/src/java/org/apache/velocity/runtime ... geirm
- cvs commit: jakarta-velocity/src/java/org/apache/velocity/runtime ... geirm
- cvs commit: jakarta-velocity/src/java/org/apache/velocity/runtime ... jvanzyl
- cvs commit: jakarta-velocity/src/java/org/apache/velocity/runtime ... jvanzyl
- cvs commit: jakarta-velocity/src/java/org/apache/velocity/runtime ... geirm
- cvs commit: jakarta-velocity/src/java/org/apache/velocity/runtime ... jvanzyl
- cvs commit: jakarta-velocity/src/java/org/apache/velocity/runtime ... geirm
