svn commit: r949382 - in /cassandra/branches/cassandra-0.6: CHANGES.txt src/java/org/apache/cassandra/utils/FBUtilities.java

[jbellis]

Author: jbellis
Date: Sat May 29 11:55:53 2010
New Revision: 949382

URL: http://svn.apache.org/viewvc?rev=949382&view=rev
Log:
backport cache size fix for 100% from 0.7.  patch by Jon Hermes; reviewed by 
jbellis for CASSANDRA-1129

Modified:
    cassandra/branches/cassandra-0.6/CHANGES.txt
    
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/utils/FBUtilities.java

Modified: cassandra/branches/cassandra-0.6/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/CHANGES.txt?rev=949382&r1=949381&r2=949382&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.6/CHANGES.txt Sat May 29 11:55:53 2010
@@ -2,6 +2,7 @@
  * retry to make streaming connections up to 8 times. (CASSANDRA-1019)
  * fix potential for duplicate rows seen by Hadoop jobs (CASSANDRA-1042)
  * reject describe_ring() calls on invalid keyspaces (CASSANDRA-1111)
+ * fix cache size calculation for size of 100% (CASSANDRA-1129)
 
 0.6.2
  * fix contrib/word_count build. (CASSANDRA-992)

Modified: 
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/utils/FBUtilities.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/utils/FBUtilities.java?rev=949382&r1=949381&r2=949382&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/utils/FBUtilities.java
 (original)
+++ 
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/utils/FBUtilities.java
 Sat May 29 11:55:53 2010
@@ -104,7 +104,7 @@ public class FBUtilities
         if (fractOrAbs < 0)
             throw new UnsupportedOperationException("unexpected negative value 
" + fractOrAbs);
 
-        if (0 < fractOrAbs && fractOrAbs < 1)
+        if (0 < fractOrAbs && fractOrAbs <= 1)
         {
             // fraction
             return Math.max(1, (long)(fractOrAbs * total));