remm 01/07/22 23:24:08
Modified: catalina/src/share/org/apache/naming/resources
FileDirContext.java
Log:
- Close the input stream after finishing copying. Otherwise, that was causing
problems deleting resources which were the source of a COPY.
Revision Changes Path
1.5 +6 -6
jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/FileDirContext.java
Index: FileDirContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/FileDirContext.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FileDirContext.java 2001/06/22 20:20:54 1.4
+++ FileDirContext.java 2001/07/23 06:24:08 1.5
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/FileDirContext.java,v
1.4 2001/06/22 20:20:54 glenn Exp $
- * $Revision: 1.4 $
- * $Date: 2001/06/22 20:20:54 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/FileDirContext.java,v
1.5 2001/07/23 06:24:08 remm Exp $
+ * $Revision: 1.5 $
+ * $Date: 2001/07/23 06:24:08 $
*
* ====================================================================
*
@@ -98,7 +98,7 @@
* Filesystem Directory Context implementation helper class.
*
* @author Remy Maucherat
- * @version $Revision: 1.4 $ $Date: 2001/06/22 20:20:54 $
+ * @version $Revision: 1.5 $ $Date: 2001/07/23 06:24:08 $
*/
public class FileDirContext extends BaseDirContext {
@@ -594,9 +594,9 @@
break;
os.write(buffer, 0, len);
}
+ } finally {
os.close();
- } catch (IOException ex) {
- os.close();
+ is.close();
}
} catch (IOException e) {
throw new NamingException
