Commits

mbogaert  committed b68f2b2

Applied patch from WW-614: Cannot set velocity macro autoreloading.

git-svn-id: http://svn.opensymphony.com/svn/webwork/trunk@571573baa09-0c28-0410-bef9-dab3c582ae83

  • Participants
  • Parent commits 750fbd9

Comments (0)

Files changed (1)

File src/java/com/opensymphony/webwork/views/velocity/VelocityManager.java

 
         Properties properties = new Properties();
 
+        // now apply our systemic defaults, then allow user to override
+        applyDefaultConfiguration(context, properties);
+
         /**
          * if the user has specified an external velocity configuration file, we'll want to search for it in the
          * following order
             }
         }
 
-        // now apply our systemic defaults
-        applyDefaultConfiguration(context, properties);
-
         // for debugging purposes, allows users to dump out the properties that have been configured
         if (log.isDebugEnabled()) {
             log.debug("Initializing Velocity with the following properties ...");