[jboss-cvs] jboss-portal/core/src/main/org/jboss/portlet ...

[Chris Laprun]

  User: claprun 
  Date: 06/08/12 14:51:01

  Modified:    core/src/main/org/jboss/portlet  JBossActionResponse.java
  Log:
  JBPORTAL-979:
  - Added enforceAbsoluteURL and isURLAbsolute on URLTools.
  - Use URLTool.enforceAbsoluteURL where needed.
  
  Revision  Changes    Path
  1.16      +11 -13    jboss-portal/core/src/main/org/jboss/portlet/JBossActionResponse.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: JBossActionResponse.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portlet/JBossActionResponse.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -b -r1.15 -r1.16
  --- JBossActionResponse.java	31 Jul 2006 19:29:51 -0000	1.15
  +++ JBossActionResponse.java	12 Aug 2006 18:51:01 -0000	1.16
  @@ -21,20 +21,21 @@
   */
   package org.jboss.portlet;
   
  -import javax.portlet.PortletRequest;
  -
  -import org.jboss.portal.portlet.impl.jsr168.ActionResponseImpl;
  -import org.jboss.portal.portlet.impl.jsr168.PortletRequestImpl;
  -import org.jboss.portal.portlet.invocation.ActionInvocation;
  -import org.jboss.portal.core.output.SignOutResult;
  +import org.jboss.portal.common.util.URLTools;
   import org.jboss.portal.core.api.JBossPortalNode;
   import org.jboss.portal.core.api.PortalNodeURLFactory;
  -import org.jboss.portal.node.PortalNodeURL;
  +import org.jboss.portal.core.output.SignOutResult;
   import org.jboss.portal.node.PortalNode;
  +import org.jboss.portal.node.PortalNodeURL;
  +import org.jboss.portal.portlet.impl.jsr168.ActionResponseImpl;
  +import org.jboss.portal.portlet.impl.jsr168.PortletRequestImpl;
  +import org.jboss.portal.portlet.invocation.ActionInvocation;
  +
  +import javax.portlet.PortletRequest;
   
   /**
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  - * @version $Revision: 1.15 $
  + * @version $Revision: 1.16 $
    */
   public class JBossActionResponse extends ActionResponseImpl
   {
  @@ -138,10 +139,7 @@
         {
            throw new IllegalArgumentException("Null location is not accepted");
         }
  -      if (!location.startsWith("http://") && !location.startsWith("/"))
  -      {
  -         throw new IllegalArgumentException("Invalid location " + location);
  -      }
  +      URLTools.enforceAbsoluteURL(location);
         sendRedirect(new SignOutResult(location));
      }
   }