cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anto...@apache.org
Subject svn commit: r425627 - in /cocoon/branches/BRANCH_2_1_X: src/java/org/apache/cocoon/components/store/impl/EHDefaultStore.java status.xml
Date Wed, 26 Jul 2006 05:07:27 GMT
Author: antonio
Date: Tue Jul 25 22:07:26 2006
New Revision: 425627

URL: http://svn.apache.org/viewvc?rev=425627&view=rev
Log:

<action dev="AG" type="fix" fixes-bug="COCOON-1885" due-to="Ard Schrijvers" due-to-email="a.schrijvers@hippo.nl">
  Core: EHDefaultStore returns in the size() method the wrong number of keys.
</action>

Modified:
    cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/store/impl/EHDefaultStore.java
    cocoon/branches/BRANCH_2_1_X/status.xml

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/store/impl/EHDefaultStore.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/store/impl/EHDefaultStore.java?rev=425627&r1=425626&r2=425627&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/store/impl/EHDefaultStore.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/store/impl/EHDefaultStore.java
Tue Jul 25 22:07:26 2006
@@ -439,8 +439,10 @@
      */
     public int size() {
         try {
-            return this.cache.getSize();
-        } catch (CacheException e) {
+            // cast to int due ehcache implementation returns a long instead of int.
+            // See: http://ehcache.sourceforge.net/javadoc/net/sf/ehcache/Cache.html#getMemoryStoreSize()
+            return (int)this.cache.getMemoryStoreSize();
+        } catch (IllegalStateException e) {
             if (getLogger().isWarnEnabled()) {
                 getLogger().warn("Error while getting cache size", e);
             }

Modified: cocoon/branches/BRANCH_2_1_X/status.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/status.xml?rev=425627&r1=425626&r2=425627&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Tue Jul 25 22:07:26 2006
@@ -182,6 +182,9 @@
   <release version="@version@" date="@date@">
 -->
   <release version="2.1.10" date="TBD">
+    <action dev="AG" type="fix" fixes-bug="COCOON-1885" due-to="Ard Schrijvers" due-to-email="a.schrijvers@hippo.nl">
+      Core: EHDefaultStore returns in the size() method the wrong number of keys.
+    </action>
     <action dev="CZ" type="add">
       CForms block: JavaClassValidatorBuilder supports Configurable validator implementations.
New AbstractJavaValidator
                     implementation supports generation of customized fail messages.



Mime
View raw message