velocity-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nbu...@apache.org
Subject svn commit: r928244 - in /velocity/engine/trunk/src: java/org/apache/velocity/runtime/directive/Parse.java test/org/apache/velocity/test/issues/Velocity758TestCase.java
Date Sat, 27 Mar 2010 18:45:55 GMT
Author: nbubna
Date: Sat Mar 27 18:45:54 2010
New Revision: 928244

URL: http://svn.apache.org/viewvc?rev=928244&view=rev
Log:
VELOCITY-758 better log/exception messages (thanks to Jarkko Viinamaki) and give event handler
a chance to handle null args

Added:
    velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity758TestCase.java
Modified:
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/Parse.java

Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/Parse.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/Parse.java?rev=928244&r1=928243&r2=928244&view=diff
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/Parse.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/Parse.java Sat Mar
27 18:45:54 2010
@@ -131,31 +131,28 @@ public class Parse extends InputBase
          */
         if ( node.jjtGetNumChildren() == 0 )
         {
-            throw new VelocityException("parameter missing: template name at "
-                 + Log.formatFileString(this));
+            throw new VelocityException("#parse(): argument missing at " +
+                                        Log.formatFileString(this));
         }
 
         /*
          *  does it have a value?  If you have a null reference, then no.
          */
         Object value =  node.jjtGetChild(0).value( context );
-
-        if ( value == null)
+        if (value == null && rsvc.getLog().isDebugEnabled())
         {
-            rsvc.getLog().error("#parse() null argument");
-            return  false;
+            rsvc.getLog().debug("#parse(): null argument at " +
+                                Log.formatFileString(this));
         }
 
         /*
          *  get the path
          */
-        String sourcearg = value.toString();
+        String sourcearg = value == null ? null : value.toString();
 
         /*
          *  check to see if the argument will be changed by the event cartridge
          */
-
-
         String arg = EventHandlerUtil.includeEvent( rsvc, context, sourcearg, context.getCurrentTemplateName(),
getName());
 
         /*

Added: velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity758TestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity758TestCase.java?rev=928244&view=auto
==============================================================================
--- velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity758TestCase.java
(added)
+++ velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity758TestCase.java
Sat Mar 27 18:45:54 2010
@@ -0,0 +1,66 @@
+package org.apache.velocity.test.issues;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+import org.apache.velocity.app.event.EventCartridge;
+import org.apache.velocity.app.event.IncludeEventHandler;
+import org.apache.velocity.context.Context;
+import org.apache.velocity.exception.VelocityException;
+import org.apache.velocity.test.BaseTestCase;
+
+/**
+ * This class tests VELOCITY-758.
+ */
+public class Velocity758TestCase extends BaseTestCase
+{
+    public Velocity758TestCase(String name)
+    {
+        super(name);
+    }
+
+    public void testNullArgumentForParse()
+    {
+        assertEvalEquals("", "#parse($foo)");
+    }
+
+    public void testOverrideNullArgumentForParse()
+    {
+        String nullContent = "Parse arg was null";
+        addTemplate("null.vm", nullContent);
+        
+        EventCartridge ec = new EventCartridge();
+        ec.addEventHandler(new Handler());
+        ec.attachToContext(context);
+
+        assertEvalEquals(nullContent, "#parse($foo)");
+    }
+
+    public static class Handler implements IncludeEventHandler
+    {
+        public String includeEvent(String parsePath, String parentPath, String directive)
+        {
+            if (parsePath == null)
+            {
+                parsePath = "null.vm";
+            }
+            return parsePath;
+        }
+    }
+}



Mime
View raw message