You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-dev@portals.apache.org by ta...@apache.org on 2004/04/07 05:40:34 UTC

cvs commit: jakarta-pluto/portal/src/java/org/apache/pluto/portalImpl/core PortalURL.java

taylor      2004/04/06 20:40:34

  Modified:    portal/src/java/org/apache/pluto/portalImpl/core
                        PortalURL.java
  Log:
  found this bug in J2, was causing Tomcat to NPE
  
  PR:
  Obtained from:
  Submitted by:	
  Reviewed by:	
  CVS: ----------------------------------------------------------------------
  CVS: PR:
  CVS:   If this change addresses a PR in the problem report tracking
  CVS:   database, then enter the PR number(s) here.
  CVS: Obtained from:
  CVS:   If this change has been taken from another system, such as NCSA,
  CVS:   then name the system in this line, otherwise delete it.
  CVS: Submitted by:
  CVS:   If this code has been contributed to Apache by someone else; i.e.,
  CVS:   they sent us a patch or a new module, then include their name/email
  CVS:   address here. If this is your work then delete this line.
  CVS: Reviewed by:
  CVS:   If we are doing pre-commit code reviews and someone else has
  CVS:   reviewed your changes, include their name(s) here.
  CVS:   If you have not had it reviewed then delete this line.
  
  Revision  Changes    Path
  1.4       +4 -3      jakarta-pluto/portal/src/java/org/apache/pluto/portalImpl/core/PortalURL.java
  
  Index: PortalURL.java
  ===================================================================
  RCS file: /home/cvs/jakarta-pluto/portal/src/java/org/apache/pluto/portalImpl/core/PortalURL.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- PortalURL.java	2 Mar 2004 14:48:56 -0000	1.3
  +++ PortalURL.java	7 Apr 2004 03:40:34 -0000	1.4
  @@ -370,9 +370,10 @@
           // check the complete pathInfo for
           // * navigational information
           // * control information
  -        String pathInfo = environment.getRequest().getPathInfo();
  -
  -        if (pathInfo != null) {
  +        
  +        if (environment.getRequest().getPathInfo() != null) 
  +        {
  +            String pathInfo = new String(environment.getRequest().getPathInfo());
               StringTokenizer tokenizer = new StringTokenizer(pathInfo, "/.");
   
               int mode = 0; // 0=navigation, 1=control information