Author: unico
Date: Tue Aug 9 03:55:16 2005
New Revision: 231017
URL: http://svn.apache.org/viewcvs?rev=231017&view=rev
Log:
fix bug 34282, remove memory intensive uri cache,
thanks to Max Pfingsterhorn (m.pfingsterhorn at hippo dot nl)
Modified:
jakarta/slide/branches/SLIDE_2_1_RELEASE_BRANCH/src/share/org/apache/slide/common/Namespace.java
Modified:
jakarta/slide/branches/SLIDE_2_1_RELEASE_BRANCH/src/share/org/apache/slide/common/Namespace.java
URL:
http://svn.apache.org/viewcvs/jakarta/slide/branches/SLIDE_2_1_RELEASE_BRANCH/src/share/org/apache/slide/common/Namespace.java?rev=231017&r1=231016&r2=231017&view=diff
==============================================================================
---
jakarta/slide/branches/SLIDE_2_1_RELEASE_BRANCH/src/share/org/apache/slide/common/Namespace.java
(original)
+++
jakarta/slide/branches/SLIDE_2_1_RELEASE_BRANCH/src/share/org/apache/slide/common/Namespace.java
Tue Aug 9 03:55:16 2005
@@ -165,12 +165,6 @@
/**
- * Uri cache.
- */
- private Hashtable uriCache;
-
-
- /**
* Default descriptors store classname.
*/
private String defaultStoreClassname =
@@ -206,7 +200,6 @@
stores = new Hashtable();
connectedServices = new Vector();
name = new String();
- uriCache = new Hashtable();
}
@@ -664,22 +657,8 @@
*/
public Uri getUri(SlideToken token, String uri, boolean forcedEnlistment) {
- Uri result = null;
- Object temp = null;
- temp = uriCache.get(uri);
- if (temp == null) {
- result = new Uri(token, this, uri);
- uriCache.put(uri, result);
- if (uriCache.size() > 10000) {
- clearUriCache();
- }
- } else {
- result = (Uri) temp;
- result = result.cloneObject();
- result.setToken(token);
- result.reconnectServices();
- }
-
+ Uri result = new Uri(token, this, uri);
+
// if a different forceEnlistment value want to be used
// wrap the used token to reflect the different value
if (token != null && token.isForceStoreEnlistment() !=
forcedEnlistment) {
@@ -690,14 +669,6 @@
return result;
- }
-
-
- /**
- * Clear uri cache.
- */
- void clearUriCache() {
- uriCache.clear();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
