tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From billbar...@apache.org
Subject cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/util/net StreamHandlerFactory.java
Date Thu, 27 Dec 2001 07:10:11 GMT
billbarker    01/12/26 23:10:11

  Modified:    src/share/org/apache/tomcat/util/net
                        StreamHandlerFactory.java
  Log:
  If it is right to ignore "jar", than it must be right to ignore "file".
  
  This should finish passing off the protocols used internally by Tomcat to the System CL,
where they can't cause problems.  It seems that under some conditions, that the App-CL recursively
tries to re-load handlers that it cares about.  With this, it goes back to the 3.3.0 behavior
for CL-related protocols.
  
  Revision  Changes    Path
  1.6       +3 -2      jakarta-tomcat/src/share/org/apache/tomcat/util/net/StreamHandlerFactory.java
  
  Index: StreamHandlerFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/net/StreamHandlerFactory.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- StreamHandlerFactory.java	2001/12/26 05:25:30	1.5
  +++ StreamHandlerFactory.java	2001/12/27 07:10:11	1.6
  @@ -86,14 +86,15 @@
       /** Create a <code>URLStreamHandler</code> for this protocol.
        *  This factory differs from the default in that
        *  <ul>
  -     *  <li>If the protocol is <code>jar</code>, we decline</li>
  +     *  <li>If the protocol is <code>jar</code> 
  +     *      or <code>file</code>, we decline</li>
        *  <li>We load classes from the <code>ContextClassLoader</code></li>
        *  <li>If no handler is defined, we return a connection-less
        *       <code>URLStreamHandler</code> that allows parsing</li>
        *  </ul>
        */
       public  URLStreamHandler createURLStreamHandler(String protoS) {
  -	if("jar".equalsIgnoreCase(protoS))
  +	if("jar".equalsIgnoreCase(protoS) || "file".equalsIgnoreCase(protoS) )
   	    return null;
   	if(protocolString != System.getProperty(SYS_PROTOCOLS))
   	    loadProtocols();
  
  
  

--
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