portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject cvs commit: jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/engine/servlet ServletRequestImpl.java
Date Mon, 11 Apr 2005 13:42:49 GMT
ate         2005/04/11 06:42:49

  Modified:    portal/src/java/org/apache/jetspeed/engine/servlet
                        ServletRequestImpl.java
  Log:
  Fix for http://issues.apache.org/jira/browse/JS2-232: Invalid contextPath value returned
to local portlet applications / decorators
  
  Revision  Changes    Path
  1.38      +3 -4      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java
  
  Index: ServletRequestImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- ServletRequestImpl.java	2 Apr 2005 19:38:25 -0000	1.37
  +++ ServletRequestImpl.java	11 Apr 2005 13:42:49 -0000	1.38
  @@ -456,8 +456,7 @@
        */
     	public String getContextPath() 
     	{
  -  			return portletWindow.getPortletEntity().getPortletDefinition()
  -  					.getPortletApplicationDefinition()
  -  					.getWebApplicationDefinition().getContextRoot();
  +       String attr = (String)super.getAttribute("javax.servlet.include.context_path");
  +       return (attr != null) ? attr : super.getContextPath();
     	}
   }
  \ No newline at end of file
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org


Mime
View raw message