Author: mrdon
Date: Sun Sep 2 20:43:57 2007
New Revision: 572228
URL: http://svn.apache.org/viewvc?rev=572228&view=rev
Log:
Switched the injection order to favor application scope WW-2125
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java?rev=572228&r1=572227&r2=572228&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java
Sun Sep 2 20:43:57 2007
@@ -137,16 +137,16 @@
((ParameterAware) action).setParameters(context.getParameters());
}
- if (action instanceof RequestAware) {
- ((RequestAware) action).setRequest((Map) context.get("request"));
+ if (action instanceof ApplicationAware) {
+ ((ApplicationAware)
action).setApplication(context.getApplication());
}
-
+
if (action instanceof SessionAware) {
((SessionAware) action).setSession(context.getSession());
}
-
- if (action instanceof ApplicationAware) {
- ((ApplicationAware)
action).setApplication(context.getApplication());
+
+ if (action instanceof RequestAware) {
+ ((RequestAware) action).setRequest((Map) context.get("request"));
}
if (action instanceof PrincipalAware) {
