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

[cbrisson]

Author: cbrisson
Date: Sun Nov 13 15:45:25 2016
New Revision: 1769507

URL: http://svn.apache.org/viewvc?rev=1769507&view=rev
Log:
[tools] minor code cleanup

Modified:
    
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityView.java
    
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/VelocityView.java
URL: 
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityView.java?rev=1769507&r1=1769506&r2=1769507&view=diff
==============================================================================
--- 
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityView.java
 (original)
+++ 
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityView.java
 Sun Nov 13 15:45:25 2016
@@ -327,7 +327,10 @@ public class VelocityView extends ViewTo
 
         // check for servlet-wide user props in the config init params at the
         // conventional location, and be silent if they're missing
-        setProps(velocity, USER_PROPERTIES_PATH, false);
+        if (!USER_PROPERTIES_PATH.equals(appPropsPath))
+        {
+            setProps(velocity, USER_PROPERTIES_PATH, false);
+        }
 
         // check for a custom location for servlet-wide user props
         String servletPropsPath = config.getInitParameter(PROPERTIES_KEY);

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=1769507&r1=1769506&r2=1769507&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
 Sun Nov 13 15:45:25 2016
@@ -29,7 +29,6 @@ import org.slf4j.Logger;
 import org.apache.velocity.util.introspection.AbstractChainableUberspector;
 import org.apache.velocity.util.introspection.Info;
 import org.apache.velocity.util.introspection.Introspector;
-import org.apache.velocity.util.introspection.VelMethod;
 import org.apache.velocity.util.introspection.VelPropertyGet;
 import org.apache.velocity.util.introspection.VelPropertySet;
 import org.apache.velocity.runtime.parser.node.AbstractExecutor;