You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by jo...@apache.org on 2011/04/07 11:44:15 UTC
svn commit: r1089792 -
/struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/servlet/PortletServletResponseJSR286.java
Author: jogep
Date: Thu Apr 7 09:44:15 2011
New Revision: 1089792
URL: http://svn.apache.org/viewvc?rev=1089792&view=rev
Log:
Add missing else statement. Otherwise the IllegalStateException is also thrown when PortletResponse is instanceof ResourceRespons.
Modified:
struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/servlet/PortletServletResponseJSR286.java
Modified: struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/servlet/PortletServletResponseJSR286.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/servlet/PortletServletResponseJSR286.java?rev=1089792&r1=1089791&r2=1089792&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/servlet/PortletServletResponseJSR286.java (original)
+++ struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/servlet/PortletServletResponseJSR286.java Thu Apr 7 09:44:15 2011
@@ -1,12 +1,16 @@
package org.apache.struts2.portlet.servlet;
-import javax.servlet.ServletOutputStream;
import java.io.IOException;
import java.io.PrintWriter;
import java.util.Locale;
-import javax.portlet.ResourceResponse;
+
import javax.portlet.MimeResponse;
import javax.portlet.PortletResponse;
+import javax.portlet.ResourceResponse;
+import javax.servlet.ServletOutputStream;
+
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
/**
* PortletServletResponseJSR286.
@@ -15,6 +19,8 @@ import javax.portlet.PortletResponse;
*/
public class PortletServletResponseJSR286 extends PortletServletResponse {
+ private static final Logger LOG = LoggerFactory.getLogger(PortletServletResponseJSR286.class);
+
public PortletServletResponseJSR286( PortletResponse portletResponse ) {
super(portletResponse);
}
@@ -123,14 +129,18 @@ public class PortletServletResponseJSR28
if(portletResponse instanceof ResourceResponse) {
((ResourceResponse)portletResponse).setCharacterEncoding(charset);
}
- throw new IllegalStateException("Only allowed in resource phase");
+ else {
+ throw new IllegalStateException("Only allowed in resource phase");
+ }
}
public void setContentLength(int len) {
if(portletResponse instanceof ResourceResponse) {
((ResourceResponse)portletResponse).setContentLength(len);
}
- throw new IllegalStateException("Only allowed in resource phase");
+ else {
+ throw new IllegalStateException("Only allowed in resource phase");
+ }
}
public void setContentType(String type) {
@@ -146,7 +156,9 @@ public class PortletServletResponseJSR28
if(portletResponse instanceof ResourceResponse) {
((ResourceResponse)portletResponse).setLocale(loc);
}
- throw new IllegalStateException("Only allowed in resource phase");
+ else {
+ throw new IllegalStateException("Only allowed in resource phase");
+ }
}
}