Author: cbrisson
Date: Fri Dec  2 17:30:44 2016
New Revision: 1772382

URL: http://svn.apache.org/viewvc?rev=1772382&view=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&r1=1772381&r2=1772382&view=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) {


Reply via email to