[infinispan-commits] Infinispan SVN: r2524 - trunk/core/src/main/java/org/infinispan/util/concurrent and 1 other directory.

[infinispan-commits at lists.jboss.org]

Author: trustin
Date: 2010-10-20 06:50:44 -0400 (Wed, 20 Oct 2010)
New Revision: 2524

Modified:
   branches/4.2.x/core/src/main/java/org/infinispan/util/concurrent/BoundedConcurrentHashMap.java
   trunk/core/src/main/java/org/infinispan/util/concurrent/BoundedConcurrentHashMap.java
Log:
Suppressed bad warnings related with read-volatiles

Modified: branches/4.2.x/core/src/main/java/org/infinispan/util/concurrent/BoundedConcurrentHashMap.java
===================================================================
--- branches/4.2.x/core/src/main/java/org/infinispan/util/concurrent/BoundedConcurrentHashMap.java	2010-10-20 10:34:58 UTC (rev 2523)
+++ branches/4.2.x/core/src/main/java/org/infinispan/util/concurrent/BoundedConcurrentHashMap.java	2010-10-20 10:50:44 UTC (rev 2524)
@@ -1468,10 +1468,10 @@
 
       // Try a few times without locking
       for (int k = 0; k < RETRIES_BEFORE_LOCK; ++ k) {
-         int sum = 0;
          int mcsum = 0;
          for (int i = 0; i < segments.length; ++ i) {
-            int c = segments[i].count;
+            @SuppressWarnings("unused")
+            int c = segments[i].count; // read-volatile
             mcsum += mc[i] = segments[i].modCount;
             if (segments[i].containsValue(value)) {
                return true;
@@ -1480,7 +1480,8 @@
          boolean cleanSweep = true;
          if (mcsum != 0) {
             for (int i = 0; i < segments.length; ++ i) {
-               int c = segments[i].count;
+               @SuppressWarnings("unused")
+               int c = segments[i].count; // read-volatile
                if (mc[i] != segments[i].modCount) {
                   cleanSweep = false;
                   break;

Modified: trunk/core/src/main/java/org/infinispan/util/concurrent/BoundedConcurrentHashMap.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/concurrent/BoundedConcurrentHashMap.java	2010-10-20 10:34:58 UTC (rev 2523)
+++ trunk/core/src/main/java/org/infinispan/util/concurrent/BoundedConcurrentHashMap.java	2010-10-20 10:50:44 UTC (rev 2524)
@@ -1468,10 +1468,10 @@
 
       // Try a few times without locking
       for (int k = 0; k < RETRIES_BEFORE_LOCK; ++ k) {
-         int sum = 0;
          int mcsum = 0;
          for (int i = 0; i < segments.length; ++ i) {
-            int c = segments[i].count;
+            @SuppressWarnings("unused")
+            int c = segments[i].count; // read-volatile
             mcsum += mc[i] = segments[i].modCount;
             if (segments[i].containsValue(value)) {
                return true;
@@ -1480,7 +1480,8 @@
          boolean cleanSweep = true;
          if (mcsum != 0) {
             for (int i = 0; i < segments.length; ++ i) {
-               int c = segments[i].count;
+               @SuppressWarnings("unused")
+               int c = segments[i].count; // read-volatile
                if (mc[i] != segments[i].modCount) {
                   cleanSweep = false;
                   break;