tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kin...@apache.org
Subject cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler SmapUtil.java
Date Tue, 19 Nov 2002 03:27:44 GMT
kinman      2002/11/18 19:27:44

  Modified:    jasper2/src/share/org/apache/jasper/compiler SmapUtil.java
  Log:
  - "Fix" 14660: Accessing smap files in a jar produces a NPE.
  
    Comment out the offending codes, as this functionality is not currently
    useful.
  
  Revision  Changes    Path
  1.7       +6 -0      jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/SmapUtil.java
  
  Index: SmapUtil.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/SmapUtil.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- SmapUtil.java	22 Oct 2002 03:00:20 -0000	1.6
  +++ SmapUtil.java	19 Nov 2002 03:27:44 -0000	1.7
  @@ -100,6 +100,11 @@
   	// set up our SMAP generator
   	SmapGenerator g = new SmapGenerator();
   
  +	/** Disable reading of input SMAP because:
  +	    1. There is a bug here: getRealPath() is null if .jsp is in a jar
  +		Bugzilla 14660.
  +	    2. Mappings from other sources into .jsp files are not supported.
  +	    TODO: fix 1. if 2. is not true.
   	// determine if we have an input SMAP
   	String smapPath = inputSmapPath(ctxt.getRealPath(ctxt.getJspFile()));
           File inputSmap = new File(smapPath);
  @@ -109,6 +114,7 @@
   	    String subSmapString = new String(subSmap, SMAP_ENCODING);
   	    g.addSmap(subSmapString, "JSP");
   	}
  +	**/
   
           // now, assemble info about our own stratum (JSP) using JspLineMap
           SmapStratum s = new SmapStratum("JSP");
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message