remm 01/07/22 23:40:47
Modified: catalina/src/share/org/apache/naming/resources
FileDirContext.java
Log:
- Fix another rare case were unwanted file locking could occur.
Revision Changes Path
1.6 +8 -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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FileDirContext.java 2001/07/23 06:24:08 1.5
+++ FileDirContext.java 2001/07/23 06:40:46 1.6
@@ -1,7 +1,7 @@
/*
- * $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 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/FileDirContext.java,v
1.6 2001/07/23 06:40:46 remm Exp $
+ * $Revision: 1.6 $
+ * $Date: 2001/07/23 06:40:46 $
*
* ====================================================================
*
@@ -98,7 +98,7 @@
* Filesystem Directory Context implementation helper class.
*
* @author Remy Maucherat
- * @version $Revision: 1.5 $ $Date: 2001/07/23 06:24:08 $
+ * @version $Revision: 1.6 $ $Date: 2001/07/23 06:40:46 $
*/
public class FileDirContext extends BaseDirContext {
@@ -584,10 +584,11 @@
// Open os
try {
- FileOutputStream os = new FileOutputStream(file);
+ FileOutputStream os = null;
byte buffer[] = new byte[BUFFER_SIZE];
int len = -1;
try {
+ os = new FileOutputStream(file);
while (true) {
len = is.read(buffer);
if (len == -1)
@@ -595,7 +596,8 @@
os.write(buffer, 0, len);
}
} finally {
- os.close();
+ if (os != null)
+ os.close();
is.close();
}
} catch (IOException e) {
