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

[Chris Laprun]

  User: claprun 
  Date: 06/08/12 14:47:45

  Modified:    portlet/src/main/org/jboss/portal/portlet/impl   Tag:
                        JBoss_Portal_Branch_2_2 PortletResponseImpl.java
                        ActionResponseImpl.java
  Log:
  JBPORTAL-979: Added check for https on PortletResponseImpl as well.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.8.4.2   +2 -2      jboss-portal/portlet/src/main/org/jboss/portal/portlet/impl/Attic/PortletResponseImpl.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PortletResponseImpl.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/portlet/src/main/org/jboss/portal/portlet/impl/Attic/PortletResponseImpl.java,v
  retrieving revision 1.8.4.1
  retrieving revision 1.8.4.2
  diff -u -b -r1.8.4.1 -r1.8.4.2
  --- PortletResponseImpl.java	10 Jan 2006 15:00:27 -0000	1.8.4.1
  +++ PortletResponseImpl.java	12 Aug 2006 18:47:45 -0000	1.8.4.2
  @@ -30,7 +30,7 @@
   
   /**
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  - * @version $Revision: 1.8.4.1 $
  + * @version $Revision: 1.8.4.2 $
    */
   public abstract class PortletResponseImpl implements PortletResponse
   {
  @@ -54,7 +54,7 @@
         {
            throw new IllegalArgumentException("URL must not be null");
         }
  -      if (!url.startsWith("http://") && !url.startsWith("/"))
  +      if (!url.startsWith("http://") && !url.startsWith("/") && !url.startsWith("https://"))
         {
            throw new IllegalArgumentException("invalid URL " + url);
         }
  
  
  
  1.13.4.3  +2 -2      jboss-portal/portlet/src/main/org/jboss/portal/portlet/impl/Attic/ActionResponseImpl.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ActionResponseImpl.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/portlet/src/main/org/jboss/portal/portlet/impl/Attic/ActionResponseImpl.java,v
  retrieving revision 1.13.4.2
  retrieving revision 1.13.4.3
  diff -u -b -r1.13.4.2 -r1.13.4.3
  --- ActionResponseImpl.java	12 Aug 2006 12:47:51 -0000	1.13.4.2
  +++ ActionResponseImpl.java	12 Aug 2006 18:47:45 -0000	1.13.4.3
  @@ -38,7 +38,7 @@
   
   /**
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  - * @version $Revision: 1.13.4.2 $
  + * @version $Revision: 1.13.4.3 $
    */
   public class ActionResponseImpl extends PortletResponseImpl implements ActionResponse
   {
  @@ -126,7 +126,7 @@
            }
            if (!location.startsWith("http://") && !location.startsWith("/") && !location.startsWith("https://"))
            {
  -            throw new IllegalArgumentException("No relative urls are accepted");
  +            throw new IllegalArgumentException("No relative urls are accepted. Was: " + location);
            }
            result = new HTTPRedirectionResult(location);
            decision = WANT_REDIRECT;