svn commit: r794105 - /struts/struts2/trunk/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java

[musachy]

Author: musachy
Date: Tue Jul 14 22:45:13 2009
New Revision: 794105

URL: http://svn.apache.org/viewvc?rev=794105&view=rev
Log:
init reloading class loader before calling setApplication

Modified:
    
struts/struts2/trunk/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java

Modified: 
struts/struts2/trunk/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java?rev=794105&r1=794104&r2=794105&view=diff
==============================================================================
--- 
struts/struts2/trunk/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java
 (original)
+++ 
struts/struts2/trunk/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java
 Tue Jul 14 22:45:13 2009
@@ -89,8 +89,6 @@
             return;
         }
 
-        this.setApplicationContext(appContext);
-
         if ("true".equals(devMode)
                 && StringUtils.isNotBlank(watchList)
                 && appContext instanceof 
ClassReloadingXMLWebApplicationContext) {
@@ -102,6 +100,8 @@
             reloadingContext.refresh();
         }
 
+        this.setApplicationContext(appContext);
+
         int type = AutowireCapableBeanFactory.AUTOWIRE_BY_NAME;   // default
         if ("name".equals(autoWire)) {
             type = AutowireCapableBeanFactory.AUTOWIRE_BY_NAME;