svn commit: r1772375 - in /velocity/engine/trunk: pom.xml velocity-engine-assembly/pom.xml velocity-engine-core/pom.xml velocity-engine-examples/pom.xml velocity-engine-scripting/pom.xml

2016-12-02 Thread cbrisson 
Author: cbrisson
Date: Fri Dec  2 16:56:26 2016
New Revision: 1772375

URL: http://svn.apache.org/viewvc?rev=1772375=rev
Log:
[engine] revert pom files to 2.0-SNAPSHOT for the next RC iteration

Modified:
velocity/engine/trunk/pom.xml
velocity/engine/trunk/velocity-engine-assembly/pom.xml
velocity/engine/trunk/velocity-engine-core/pom.xml
velocity/engine/trunk/velocity-engine-examples/pom.xml
velocity/engine/trunk/velocity-engine-scripting/pom.xml

Modified: velocity/engine/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/velocity/engine/trunk/pom.xml?rev=1772375=1772374=1772375=diff
==
--- velocity/engine/trunk/pom.xml (original)
+++ velocity/engine/trunk/pom.xml Fri Dec  2 16:56:26 2016
@@ -31,7 +31,7 @@
   
 
   velocity-engine-parent
-  2.1-SNAPSHOT
+  2.0-SNAPSHOT
 
   Apache Velocity
   http://velocity.apache.org/engine/devel/

Modified: velocity/engine/trunk/velocity-engine-assembly/pom.xml
URL: 
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-assembly/pom.xml?rev=1772375=1772374=1772375=diff
==
--- velocity/engine/trunk/velocity-engine-assembly/pom.xml (original)
+++ velocity/engine/trunk/velocity-engine-assembly/pom.xml Fri Dec  2 16:56:26 
2016
@@ -23,7 +23,7 @@
 
 org.apache.velocity
 velocity-engine-parent
-2.1-SNAPSHOT
+2.0-SNAPSHOT
 
 
 velocity-engine-assembly

Modified: velocity/engine/trunk/velocity-engine-core/pom.xml
URL: 
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/pom.xml?rev=1772375=1772374=1772375=diff
==
--- velocity/engine/trunk/velocity-engine-core/pom.xml (original)
+++ velocity/engine/trunk/velocity-engine-core/pom.xml Fri Dec  2 16:56:26 2016
@@ -23,7 +23,7 @@
   
 org.apache.velocity
 velocity-engine-parent
-2.1-SNAPSHOT
+2.0-SNAPSHOT
   
 
   velocity-engine-core

Modified: velocity/engine/trunk/velocity-engine-examples/pom.xml
URL: 
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-examples/pom.xml?rev=1772375=1772374=1772375=diff
==
--- velocity/engine/trunk/velocity-engine-examples/pom.xml (original)
+++ velocity/engine/trunk/velocity-engine-examples/pom.xml Fri Dec  2 16:56:26 
2016
@@ -23,7 +23,7 @@
   
 org.apache.velocity
 velocity-engine-parent
-2.1-SNAPSHOT
+2.0-SNAPSHOT
   
 
   velocity-engine-examples

Modified: velocity/engine/trunk/velocity-engine-scripting/pom.xml
URL: 
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-scripting/pom.xml?rev=1772375=1772374=1772375=diff
==
--- velocity/engine/trunk/velocity-engine-scripting/pom.xml (original)
+++ velocity/engine/trunk/velocity-engine-scripting/pom.xml Fri Dec  2 16:56:26 
2016
@@ -24,7 +24,7 @@
   
 org.apache.velocity
 velocity-engine-parent
-2.1-SNAPSHOT
+2.0-SNAPSHOT
   
   velocity-engine-scripting
   Apache Velocity - JSR 223 Scripting

svn commit: r1772379 - /velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTReference.java

2016-12-02 Thread cbrisson 
Author: cbrisson
Date: Fri Dec  2 17:26:34 2016
New Revision: 1772379

URL: http://svn.apache.org/viewvc?rev=1772379=rev
Log:
[engine] be nicer with upberspectors that don't check that the base object is 
not null

Modified:

velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTReference.java

Modified: 
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTReference.java
URL: 
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTReference.java?rev=1772379=1772378=1772379=diff
==
--- 
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTReference.java
 (original)
+++ 
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTReference.java
 Fri Dec  2 17:26:34 2016
@@ -297,17 +297,8 @@ public class ASTReference extends Simple
 if (result == null && !strictRef)  // If strict and null then 
well catch this
// next time through the 
loop
 {
-// do not call bad reference handler if the getter is 
present
-// (it means the getter has been called and returned null)
-// do not either for a quiet reference or if the *last* 
child failed while testing the reference
-Object getter = context.icacheGet(jjtGetChild(i));
-if (getter == null &&
-referenceType != QUIET_REFERENCE  &&
-(!onlyTestingReference || i < jjtGetNumChildren() 
- 1))
-{
-failedChild = i;
-break;
-}
+failedChild = i;
+break;
 }
 }
 
@@ -328,32 +319,42 @@ public class ASTReference extends Simple
 }
 else
 {
-StringBuffer name = new 
StringBuffer("$").append(rootString);
-for (int i = 0; i <= failedChild; i++)
+Node child = jjtGetChild(failedChild);
+// do not call bad reference handler if the getter is 
present
+// (it means the getter has been called and returned null)
+// do not either for a quiet reference or if the *last* 
child failed while testing the reference
+Object getter = context.icacheGet(child);
+if (getter == null &&
+referenceType != QUIET_REFERENCE  &&
+(!onlyTestingReference || failedChild < 
jjtGetNumChildren() - 1))
 {
-Node node = jjtGetChild(i);
-if (node instanceof ASTMethod)
+StringBuffer name = new 
StringBuffer("$").append(rootString);
+for (int i = 0; i <= failedChild; i++)
+{
+Node node = jjtGetChild(i);
+if (node instanceof ASTMethod)
+{
+name.append(".").append(((ASTMethod) 
node).getMethodName()).append("()");
+}
+else
+{
+
name.append(".").append(node.getFirstTokenImage());
+}
+}
+
+if (child instanceof ASTMethod)
 {
-name.append(".").append(((ASTMethod) 
node).getMethodName()).append("()");
+String methodName = ((ASTMethod) 
jjtGetChild(failedChild)).getMethodName();
+result = EventHandlerUtil.invalidMethod(rsvc, 
context,
+name.toString(), previousResult, methodName, 
uberInfo);
 }
 else
 {
-name.append(".").append(node.getFirstTokenImage());
+String property = 
jjtGetChild(failedChild).getFirstTokenImage();
+result = EventHandlerUtil.invalidGetMethod(rsvc, 
context,
+name.toString(), previousResult, property, 
uberInfo);
 }
 }
-
-if (jjtGetChild(failedChild) instanceof ASTMethod)
-{
-String methodName = ((ASTMethod) 
jjtGetChild(failedChild)).getMethodName();
-result = EventHandlerUtil.invalidMethod(rsvc, context,
-

svn commit: r1772382 - /velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/WebappUberspector.java

2016-12-02 Thread cbrisson 
Author: cbrisson
Date: Fri Dec  2 17:30:44 2016
New Revision: 1772382

URL: http://svn.apache.org/viewvc?rev=1772382=rev
Log:
[tools] add null checks in WebappUberspector

Modified:

velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/WebappUberspector.java

Modified: 
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/WebappUberspector.java
URL: 
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/WebappUberspector.java?rev=1772382=1772381=1772382=diff
==
--- 
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/WebappUberspector.java
 (original)
+++ 
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/WebappUberspector.java
 Fri Dec  2 17:30:44 2016
@@ -66,6 +66,10 @@ public class WebappUberspector extends A
  */
 public VelPropertyGet getPropertyGet(Object obj, String identifier, Info i)
 {
+if (obj == null)
+{
+return null;
+}
 VelPropertyGet ret = super.getPropertyGet(obj,identifier,i);
 
 if(ret == null)
@@ -106,6 +110,10 @@ public class WebappUberspector extends A
 public VelPropertySet getPropertySet(Object obj, String identifier,
  Object arg, Info i)
 {
+if (obj == null)
+{
+return null;
+}
 VelPropertySet ret = super.getPropertySet(obj,identifier,arg,i);
 
 if(ret == null) {