cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/config WorkDirSetup.java

[costin]

costin      01/04/21 22:38:53

  Modified:    src/share/org/apache/tomcat/modules/config WorkDirSetup.java
  Log:
  Moved the cleanDir method to FileUtil, code duplication is not good.
  
  Revision  Changes    Path
  1.5       +3 -27     
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/WorkDirSetup.java
  
  Index: WorkDirSetup.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/WorkDirSetup.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- WorkDirSetup.java 2001/02/06 06:45:30     1.4
  +++ WorkDirSetup.java 2001/04/22 05:38:52     1.5
  @@ -61,6 +61,7 @@
   
   import org.apache.tomcat.core.*;
   import org.apache.tomcat.util.*;
  +import org.apache.tomcat.util.io.*;
   import java.io.*;
   import java.net.*;
   import java.util.*;
  @@ -128,13 +129,13 @@
   
        // 
        if ( cleanWorkDir ) {
  -         clearDir(ctx.getWorkDir() );
  +         FileUtil.clearDir(ctx.getWorkDir() );
        }
       }
   
       public void contextShutdown( Context ctx ) {
        if ( cleanWorkDir ) {
  -         clearDir(ctx.getWorkDir());
  +         FileUtil.clearDir(ctx.getWorkDir());
        }
       }
   
  @@ -194,31 +195,6 @@
        }
        ctx.setWorkDir( workDirF );
       }
  -
  -    private void clearDir(File dir) {
  -        String[] files = dir.list();
  -
  -        if (files != null) {
  -         for (int i = 0; i < files.length; i++) {
  -             File f = new File(dir, files[i]);
  -
  -             if (f.isDirectory()) {
  -                 clearDir(f);
  -             }
  -
  -             try {
  -                 f.delete();
  -             } catch (Exception e) {
  -             }
  -         }
  -
  -         try {
  -             dir.delete();
  -         } catch (Exception e) {
  -         }
  -        }
  -    }
  -
   
        
   }