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

[cbrisson]

Author: cbrisson
Date: Mon Jun 25 21:59:55 2018
New Revision: 1834381

URL: http://svn.apache.org/viewvc?rev=1834381&view=rev
Log:
[tools/view] Fix another bug in config

Modified:
    
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityView.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=1834381&r1=1834380&r2=1834381&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
 Mon Jun 25 21:59:55 2018
@@ -368,7 +368,7 @@ public class VelocityView extends ViewTo
             if (appProperties != null)
             {
                 getLog().debug("Configuring Velocity with properties at: {}", 
appPropsPath);
-                velocity.setProperties(defaultProperties);
+                velocity.setProperties(appProperties);
             }
         }