Author: nilsga
Date: Fri Jun 26 08:43:42 2009
New Revision: 788633

URL: http://svn.apache.org/viewvc?rev=788633&view=rev
Log:
WW-3164

Need to inject ActionMapper in PortletUrlRenderer to avoid NPE when passing 
through to ServletUrlRenderer.

Modified:
    
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UrlRenderer.java
    
struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/components/PortletUrlRenderer.java

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UrlRenderer.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UrlRenderer.java?rev=788633&r1=788632&r2=788633&view=diff
==============================================================================
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UrlRenderer.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UrlRenderer.java
 Fri Jun 26 08:43:42 2009
@@ -21,6 +21,7 @@
 
 package org.apache.struts2.components;
 
+import org.apache.struts2.dispatcher.mapper.ActionMapper;
 import java.io.Writer;
 
 /**
@@ -49,4 +50,6 @@
         */
        void renderFormUrl(Form formComponent);
 
+      void setActionMapper(ActionMapper actionMapper);
+
 }

Modified: 
struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/components/PortletUrlRenderer.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/components/PortletUrlRenderer.java?rev=788633&r1=788632&r2=788633&view=diff
==============================================================================
--- 
struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/components/PortletUrlRenderer.java
 (original)
+++ 
struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/components/PortletUrlRenderer.java
 Fri Jun 26 08:43:42 2009
@@ -24,6 +24,7 @@
 import java.io.IOException;
 import java.io.Writer;
 
+import org.apache.struts2.dispatcher.mapper.ActionMapper; 
 import org.apache.struts2.StrutsException;
 import org.apache.struts2.portlet.context.PortletActionContext;
 import org.apache.struts2.portlet.util.PortletUrlHelper;
@@ -31,6 +32,7 @@
 
 import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.inject.Inject;
 
 /**
  * Implementation of the {...@link UrlRenderer} interface that renders URLs 
for portlet environments.
@@ -48,6 +50,11 @@
        public PortletUrlRenderer() {
                this.servletRenderer = new ServletUrlRenderer();
        }
+
+       @Inject
+       public void setActionMapper(ActionMapper actionMapper) {
+               servletRenderer.setActionMapper(actionMapper);
+       }
        
        /**
         * {...@inheritdoc}


Reply via email to