remm 01/02/04 20:41:08
Modified: catalina/src/share/org/apache/naming/resources
FileDirContext.java WARDirContext.java
Log:
- Couldn't repeat reads on returned objects. Now, the input stream
will be reopened each time streamContent() is called.
Revision Changes Path
1.2 +5 -5
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FileDirContext.java 2001/01/23 03:41:29 1.1
+++ FileDirContext.java 2001/02/05 04:41:08 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/FileDirContext.java,v
1.1 2001/01/23 03:41:29 remm Exp $
- * $Revision: 1.1 $
- * $Date: 2001/01/23 03:41:29 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/FileDirContext.java,v
1.2 2001/02/05 04:41:08 remm Exp $
+ * $Revision: 1.2 $
+ * $Date: 2001/02/05 04:41:08 $
*
* ====================================================================
*
@@ -98,7 +98,7 @@
* Filesystem Directory Context implementation helper class.
*
* @author Remy Maucherat
- * @version $Revision: 1.1 $ $Date: 2001/01/23 03:41:29 $
+ * @version $Revision: 1.2 $ $Date: 2001/02/05 04:41:08 $
*/
public class FileDirContext extends BaseDirContext {
@@ -943,7 +943,7 @@
*/
public InputStream streamContent()
throws IOException {
- if ((inputStream == null) && (binaryContent == null))
+ if (binaryContent == null)
inputStream = new FileInputStream(file);
return super.streamContent();
}
1.2 +4 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/WARDirContext.java
Index: WARDirContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/WARDirContext.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WARDirContext.java 2001/01/23 03:41:29 1.1
+++ WARDirContext.java 2001/02/05 04:41:08 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/WARDirContext.java,v
1.1 2001/01/23 03:41:29 remm Exp $
- * $Revision: 1.1 $
- * $Date: 2001/01/23 03:41:29 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/WARDirContext.java,v
1.2 2001/02/05 04:41:08 remm Exp $
+ * $Revision: 1.2 $
+ * $Date: 2001/02/05 04:41:08 $
*
* ====================================================================
*
@@ -99,7 +99,7 @@
* WAR Directory Context implementation.
*
* @author Remy Maucherat
- * @version $Revision: 1.1 $ $Date: 2001/01/23 03:41:29 $
+ * @version $Revision: 1.2 $ $Date: 2001/02/05 04:41:08 $
*/
public class WARDirContext extends BaseDirContext {
@@ -928,7 +928,7 @@
public InputStream streamContent()
throws IOException {
try {
- if ((inputStream == null) && (binaryContent == null)) {
+ if (binaryContent == null) {
inputStream = base.getInputStream(entry);
}
} catch (ZipException e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
