remm 01/07/25 17:16:08
Modified: catalina/src/share/org/apache/naming/resources
ProxyDirContext.java
Log:
- Add a cachingAllowed flag on the standard context. The caching flag
on the proxy dir context will be removed since it was not flexible enough
(the flag could only be set after the context resources were set, which
usually was after starting it).
Revision Changes Path
1.6 +5 -27
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ProxyDirContext.java 2001/07/24 22:41:05 1.5
+++ ProxyDirContext.java 2001/07/26 00:16:08 1.6
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java,v
1.5 2001/07/24 22:41:05 remm Exp $
- * $Revision: 1.5 $
- * $Date: 2001/07/24 22:41:05 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java,v
1.6 2001/07/26 00:16:08 remm Exp $
+ * $Revision: 1.6 $
+ * $Date: 2001/07/26 00:16:08 $
*
* ====================================================================
*
@@ -84,7 +84,7 @@
* Proxy Directory Context implementation.
*
* @author Remy Maucherat
- * @version $Revision: 1.5 $ $Date: 2001/07/24 22:41:05 $
+ * @version $Revision: 1.6 $ $Date: 2001/07/26 00:16:08 $
*/
public class ProxyDirContext implements DirContext {
@@ -165,12 +165,6 @@
protected int cacheTTL = 5000; // 5s
- /**
- * Caching allowed flag.
- */
- protected boolean cachingAllowed = true;
-
-
// --------------------------------------------------------- Public Methods
@@ -201,22 +195,6 @@
}
- /**
- * Is caching allowed ?
- */
- public boolean isCachingAllowed() {
- return cachingAllowed;
- }
-
-
- /**
- * Set caching allowed flag.
- */
- public void setCachingAllowed(boolean cachingAllowed) {
- this.cachingAllowed = cachingAllowed;
- }
-
-
// -------------------------------------------------------- Context Methods
@@ -1343,7 +1321,7 @@
* Lookup in cache.
*/
protected CacheEntry cacheLookup(String name) {
- if (!cachingAllowed || (cache == null))
+ if (cache == null)
return (null);
CacheEntry cacheEntry = (CacheEntry) cache.get(name);
if (cacheEntry == null) {
