cvs commit: jakarta-avalon-excalibur/io/src/java/org/apache/avalon/excalibur/io FileUtil.java

[donaldp]

donaldp     02/03/24 01:41:13

  Modified:    io/src/java/org/apache/avalon/excalibur/io FileUtil.java
  Log:
  Avoid a null pointer if file separator neither / or \
  
  Revision  Changes    Path
  1.25      +2 -2      
jakarta-avalon-excalibur/io/src/java/org/apache/avalon/excalibur/io/FileUtil.java
  
  Index: FileUtil.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-avalon-excalibur/io/src/java/org/apache/avalon/excalibur/io/FileUtil.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- FileUtil.java     24 Mar 2002 07:43:45 -0000      1.24
  +++ FileUtil.java     24 Mar 2002 09:41:13 -0000      1.25
  @@ -44,7 +44,7 @@
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
    * @author <a href="mailto:[EMAIL PROTECTED]">Jeff Turner</a>
  - * @version CVS $Revision: 1.24 $ $Date: 2002/03/24 07:43:45 $
  + * @version CVS $Revision: 1.25 $ $Date: 2002/03/24 09:41:13 $
    * @since 4.0
    */
   public final class FileUtil
  @@ -542,7 +542,7 @@
        */
       public static File resolveFile( final File baseFile, String filename )
       {
  -        String filenm = null;
  +        String filenm = filename;
           if( '/' != File.separatorChar )
           {
               filenm = filename.replace( '/', File.separatorChar );
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>