You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by bi...@apache.org on 2002/09/11 05:27:30 UTC

cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/util/depend DependClassLoader.java DependClassLoader12.java

billbarker    2002/09/10 20:27:30

  Modified:    src/share/org/apache/tomcat/util/depend
                        DependClassLoader.java DependClassLoader12.java
  Log:
  Check for Windows device names before attempting to read the class file.
  
  At least under XP, this can cause a request to hang.  However, it also has a very simple work-around.
  
  Revision  Changes    Path
  1.17      +4 -2      jakarta-tomcat/src/share/org/apache/tomcat/util/depend/DependClassLoader.java
  
  Index: DependClassLoader.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/depend/DependClassLoader.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- DependClassLoader.java	11 Jun 2002 23:16:19 -0000	1.16
  +++ DependClassLoader.java	11 Sep 2002 03:27:30 -0000	1.17
  @@ -199,8 +199,10 @@
   	// resources.
   	byte data[]=null;
   	try {
  -	    data=readFully( is );
  -	    if( data.length==0 ) data=null;
  +	    if( is.available() > 0) {
  +		data=readFully( is );
  +		if( data.length==0 ) data=null;
  +	    }
   	    is.close();
   	} catch(IOException ex ) {
   	    if( debug > 0 ) ex.printStackTrace();
  
  
  
  1.12      +4 -2      jakarta-tomcat/src/share/org/apache/tomcat/util/depend/DependClassLoader12.java
  
  Index: DependClassLoader12.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/depend/DependClassLoader12.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- DependClassLoader12.java	12 Jun 2002 00:13:37 -0000	1.11
  +++ DependClassLoader12.java	11 Sep 2002 03:27:30 -0000	1.12
  @@ -251,8 +251,10 @@
   	// resources.
   	byte data[]=null;
   	try {
  -	    data=readFully( is );
  -	    if( data.length==0 ) data=null;
  +	    if( is.available() > 0 ) {
  +		data=readFully( is );
  +		if( data.length==0 ) data=null;
  +	    }
   	    is.close();
   	} catch(IOException ex ) {
   	    if( debug > 0 ) ex.printStackTrace();
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>