Author: markt
Date: Fri Dec 27 18:11:43 2013
New Revision: 1553710
URL: http://svn.apache.org/r1553710
Log:
Align names between 7.0.x and 8.0.x (more places - thanks to kkolinko)
Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml
tomcat/trunk/java/org/apache/catalina/webresources/Cache.java
tomcat/trunk/java/org/apache/catalina/webresources/CachedResource.java
Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml?rev=1553710&r1=1553709&r2=1553710&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml Fri
Dec 27 18:11:43 2013
@@ -258,7 +258,7 @@
<TransientAttribute>cachingAllowed</TransientAttribute>
<TransientAttribute>cacheTTL</TransientAttribute>
<TransientAttribute>cacheMaxSize</TransientAttribute>
- <TransientAttribute>cacheMaxObjectSize</TransientAttribute>
+ <TransientAttribute>cacheObjectMaxSize</TransientAttribute>
<TransientAttribute>cached</TransientAttribute>
<TransientAttribute>caseSensitive</TransientAttribute>
</Description>
Modified: tomcat/trunk/java/org/apache/catalina/webresources/Cache.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/Cache.java?rev=1553710&r1=1553709&r2=1553710&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/webresources/Cache.java (original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/Cache.java Fri Dec 27
18:11:43 2013
@@ -85,7 +85,7 @@ public class Cache {
cacheEntry = newCacheEntry;
cacheEntry.validate(useClassLoaderResources);
- // Even if the resource content larger than maxObjectSizeBytes
+ // Even if the resource content larger than objectMaxSizeBytes
// there is still benefit in caching the resource metadata
long delta = cacheEntry.getSize();
Modified: tomcat/trunk/java/org/apache/catalina/webresources/CachedResource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/CachedResource.java?rev=1553710&r1=1553709&r2=1553710&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/webresources/CachedResource.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/CachedResource.java Fri
Dec 27 18:11:43 2013
@@ -278,7 +278,7 @@ public class CachedResource implements W
}
// Assume that the cache entry will always include the content unless the
- // resource content is larger than maxObjectSizeBytes. This isn't always
the
+ // resource content is larger than objectMaxSizeBytes. This isn't always
the
// case but it makes tracking the current cache size easier.
long getSize() {
long result = CACHE_ENTRY_SIZE;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
