cvs commit: jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/container/tomcat Tomcat3xContainer.java

[vmassol]

vmassol     2004/01/25 12:50:54

  Modified:    
integration/ant/src/java/org/apache/cactus/integration/ant/container/tomcat
                        Tomcat3xContainer.java
  Log:
          <action dev="VMA" type="update" fixes-bug="25034" due-to="Daniel Rabe" 
due-to-email="[EMAIL PROTECTED]">
            The <code>&lt;cactus&gt;</code> task now also cleans custom tmp
            directories (passed using the <code>tmpdir</code> attribute).
          </action>
  
  Revision  Changes    Path
  1.7       +2 -5      
jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/container/tomcat/Tomcat3xContainer.java
  
  Index: Tomcat3xContainer.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/container/tomcat/Tomcat3xContainer.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Tomcat3xContainer.java    7 Sep 2003 19:54:37 -0000       1.6
  +++ Tomcat3xContainer.java    25 Jan 2004 20:50:53 -0000      1.7
  @@ -172,10 +172,7 @@
           FileUtils fileUtils = FileUtils.newFileUtils();
           FilterChain filterChain = createFilterChain();
           
  -        if (this.tmpDir == null)
  -        {
  -            this.tmpDir = createTempDirectory(theDirName);
  -        }
  +        this.tmpDir = prepareTempDirectory(this.tmpDir, theDirName);
   
           // copy configuration files into the temporary container directory
           File confDir = createDirectory(tmpDir, "conf");
  
  
  

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