remm 02/02/26 18:55:44
Modified: catalina/src/share/org/apache/naming/resources Tag:
tomcat_40_branch BaseDirContext.java
FileDirContext.java ProxyDirContext.java
WARDirContext.java
Log:
- Post (most of) Craig's patch to fix bug 6594.
- Add (very simple) lifecycle management to the dir context implementations.
Revision Changes Path
No revision
No revision
1.1.2.2 +12 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/BaseDirContext.java
Index: BaseDirContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/BaseDirContext.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BaseDirContext.java 4 Oct 2001 19:29:12 -0000 1.1.2.1
+++ BaseDirContext.java 27 Feb 2002 02:55:43 -0000 1.1.2.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/BaseDirContext.java,v
1.1.2.1 2001/10/04 19:29:12 remm Exp $
- * $Revision: 1.1.2.1 $
- * $Date: 2001/10/04 19:29:12 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/BaseDirContext.java,v
1.1.2.2 2002/02/27 02:55:43 remm Exp $
+ * $Revision: 1.1.2.2 $
+ * $Date: 2002/02/27 02:55:43 $
*
* ====================================================================
*
@@ -85,7 +85,7 @@
* Directory Context implementation helper class.
*
* @author Remy Maucherat
- * @version $Revision: 1.1.2.1 $ $Date: 2001/10/04 19:29:12 $
+ * @version $Revision: 1.1.2.2 $ $Date: 2002/02/27 02:55:43 $
*/
public abstract class BaseDirContext implements DirContext {
@@ -265,6 +265,14 @@
// --------------------------------------------------------- Public Methods
+
+
+ /**
+ * Release any resources allocated for this directory context.
+ */
+ public void release() {
+ ; // No action taken by the default implementation
+ }
// -------------------------------------------------------- Context Methods
1.7.2.3 +17 -4
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.7.2.2
retrieving revision 1.7.2.3
diff -u -r1.7.2.2 -r1.7.2.3
--- FileDirContext.java 3 Nov 2001 02:13:27 -0000 1.7.2.2
+++ FileDirContext.java 27 Feb 2002 02:55:44 -0000 1.7.2.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/FileDirContext.java,v
1.7.2.2 2001/11/03 02:13:27 remm Exp $
- * $Revision: 1.7.2.2 $
- * $Date: 2001/11/03 02:13:27 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/FileDirContext.java,v
1.7.2.3 2002/02/27 02:55:44 remm Exp $
+ * $Revision: 1.7.2.3 $
+ * $Date: 2002/02/27 02:55:44 $
*
* ====================================================================
*
@@ -99,7 +99,7 @@
* Filesystem Directory Context implementation helper class.
*
* @author Remy Maucherat
- * @version $Revision: 1.7.2.2 $ $Date: 2001/11/03 02:13:27 $
+ * @version $Revision: 1.7.2.3 $ $Date: 2002/02/27 02:55:44 $
*/
public class FileDirContext extends BaseDirContext {
@@ -209,6 +209,19 @@
// --------------------------------------------------------- Public Methods
+
+
+ /**
+ * Release any resources allocated for this directory context.
+ */
+ public void release() {
+
+ caseSensitive = true;
+ absoluteBase = null;
+ base = null;
+ super.release();
+
+ }
// -------------------------------------------------------- Context Methods
1.6.2.3 +12 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java
Index: ProxyDirContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -u -r1.6.2.2 -r1.6.2.3
--- ProxyDirContext.java 5 Oct 2001 17:07:17 -0000 1.6.2.2
+++ ProxyDirContext.java 27 Feb 2002 02:55:44 -0000 1.6.2.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java,v
1.6.2.2 2001/10/05 17:07:17 remm Exp $
- * $Revision: 1.6.2.2 $
- * $Date: 2001/10/05 17:07:17 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java,v
1.6.2.3 2002/02/27 02:55:44 remm Exp $
+ * $Revision: 1.6.2.3 $
+ * $Date: 2002/02/27 02:55:44 $
*
* ====================================================================
*
@@ -85,7 +85,7 @@
* Proxy Directory Context implementation.
*
* @author Remy Maucherat
- * @version $Revision: 1.6.2.2 $ $Date: 2001/10/05 17:07:17 $
+ * @version $Revision: 1.6.2.3 $ $Date: 2002/02/27 02:55:44 $
*/
public class ProxyDirContext implements DirContext {
@@ -175,6 +175,14 @@
// --------------------------------------------------------- Public Methods
+
+
+ /**
+ * Return the actual directory context we are wrapping.
+ */
+ public DirContext getDirContext() {
+ return this.dirContext;
+ }
/**
1.3.2.1 +28 -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.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- WARDirContext.java 16 Aug 2001 01:20:05 -0000 1.3
+++ WARDirContext.java 27 Feb 2002 02:55:44 -0000 1.3.2.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/WARDirContext.java,v
1.3 2001/08/16 01:20:05 craigmcc Exp $
- * $Revision: 1.3 $
- * $Date: 2001/08/16 01:20:05 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/WARDirContext.java,v
1.3.2.1 2002/02/27 02:55:44 remm Exp $
+ * $Revision: 1.3.2.1 $
+ * $Date: 2002/02/27 02:55:44 $
*
* ====================================================================
*
@@ -100,7 +100,7 @@
* WAR Directory Context implementation.
*
* @author Remy Maucherat
- * @version $Revision: 1.3 $ $Date: 2001/08/16 01:20:05 $
+ * @version $Revision: 1.3.2.1 $ $Date: 2002/02/27 02:55:44 $
*/
public class WARDirContext extends BaseDirContext {
@@ -188,6 +188,30 @@
super.setDocBase(docBase);
loadEntries();
+
+ }
+
+
+ // --------------------------------------------------------- Public Methods
+
+
+ /**
+ * Release any resources allocated for this directory context.
+ */
+ public void release() {
+
+ entries = null;
+ if (base != null) {
+ try {
+ base.close();
+ } catch (IOException e) {
+ System.out.println
+ ("Exception closing WAR File " + base.getName());
+ e.printStackTrace(System.out);
+ }
+ }
+ base = null;
+ super.release();
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
