svn commit: r501746 - in /struts/struts2/trunk/core/src/main/java/org/apache/struts2: components/OptGroup.java dispatcher/ServletRedirectResult.java

[mrdon]

Author: mrdon
Date: Tue Jan 30 22:22:43 2007
New Revision: 501746

URL: http://svn.apache.org/viewvc?view=rev&rev=501746
Log:
Fixed optgroup throwing NPE, added file missing from commit fixing servlet 
action redirect
WW-1670 WW-1662

Modified:
    
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/OptGroup.java
    
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/OptGroup.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/OptGroup.java?view=diff&rev=501746&r1=501745&r2=501746
==============================================================================
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/OptGroup.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/OptGroup.java
 Tue Jan 30 22:22:43 2007
@@ -32,6 +32,8 @@
 import org.apache.struts2.views.annotations.StrutsTag;
 import org.apache.struts2.views.annotations.StrutsTagAttribute;
 
+import com.opensymphony.xwork2.inject.Container;
+import com.opensymphony.xwork2.inject.Inject;
 import com.opensymphony.xwork2.util.ValueStack;
 
 /**
@@ -89,6 +91,11 @@
                 return "empty";
             }
         };
+    }
+    
+    @Inject
+    public void setContainer(Container container) {
+        container.inject(internalUiBean);
     }
 
     public boolean end(Writer writer, String body) {

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java?view=diff&rev=501746&r1=501745&r2=501746
==============================================================================
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java
 Tue Jan 30 22:22:43 2007
@@ -85,7 +85,7 @@
 
     protected boolean prependServletContext = true;
 
-    private ActionMapper actionMapper;
+    protected ActionMapper actionMapper;
 
     public ServletRedirectResult() {
         super();