Author: mrdon
Date: Sat Jun 21 21:00:43 2008
New Revision: 670308
URL: http://svn.apache.org/viewvc?rev=670308&view=rev
Log:
Better error handling in new filters, added autowire respect property to
default list
WW-2193
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsPrepareAndExecuteFilter.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsPrepareFilter.java
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsPrepareAndExecuteFilter.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsPrepareAndExecuteFilter.java?rev=670308&r1=670307&r2=670308&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsPrepareAndExecuteFilter.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsPrepareAndExecuteFilter.java
Sat Jun 21 21:00:43 2008
@@ -49,7 +49,9 @@
cleanup = new CleanupOperations(dispatcher);
execute = new ExecuteOperations(filterConfig.getServletContext(),
dispatcher);
} finally {
- cleanup.cleanupInit();
+ if (cleanup != null) {
+ cleanup.cleanupInit();
+ }
}
}
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsPrepareFilter.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsPrepareFilter.java?rev=670308&r1=670307&r2=670308&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsPrepareFilter.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsPrepareFilter.java
Sat Jun 21 21:00:43 2008
@@ -44,7 +44,9 @@
prepare = new PrepareOperations(filterConfig.getServletContext(),
dispatcher);
cleanup = new CleanupOperations(dispatcher);
} finally {
- cleanup.cleanupInit();
+ if (cleanup != null) {
+ cleanup.cleanupInit();
+ }
}
}
Modified:
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties?rev=670308&r1=670307&r2=670308&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties
(original)
+++
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties
Sat Jun 21 21:00:43 2008
@@ -48,6 +48,10 @@
### valid values are: true, false (true is the default)
struts.objectFactory.spring.useClassCache = true
+### ensures the autowire strategy is always respected.
+### valid values are: true, false (false is the default)
+struts.objectFactory.spring.autoWire.alwaysRespect = false
+
### if specified, the default object type determiner can be overridden here
### Note: short-hand notation is supported in some cases, such as "tiger" or
"notiger"
### Alternatively, you can provide a
com.opensymphony.xwork2.util.ObjectTypeDeterminer implementation name here
