[jboss-cvs] JBossAS SVN: r92438 - projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc.

[jboss-cvs-commits at lists.jboss.org]

Author: bstansberry at jboss.com
Date: 2009-08-17 15:48:30 -0400 (Mon, 17 Aug 2009)
New Revision: 92438

Modified:
   projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/JBossCacheWrapper.java
Log:
[JBCLUSTER-239] Handle SuspectException

Modified: projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/JBossCacheWrapper.java
===================================================================
--- projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/JBossCacheWrapper.java	2009-08-17 17:57:44 UTC (rev 92437)
+++ projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/JBossCacheWrapper.java	2009-08-17 19:48:30 UTC (rev 92438)
@@ -24,7 +24,9 @@
 import java.util.Map;
 
 import org.jboss.cache.Cache;
+import org.jboss.cache.CacheException;
 import org.jboss.cache.Fqn;
+import org.jboss.cache.SuspectException;
 import org.jboss.cache.lock.TimeoutException;
 
 public class JBossCacheWrapper 
@@ -42,7 +44,7 @@
    
    Map<Object, Object> getData(Fqn<?> fqn, boolean gravitate)
    {
-      TimeoutException ex = null;
+      CacheException ex = null;
       for (int i = 0; i < RETRY; i++)
       {
          try
@@ -58,6 +60,10 @@
          {
             ex = e;
          }
+         catch (SuspectException e)
+         {
+            ex = e;
+         }
       }      
       throw new RuntimeException(RETRY_FAIL_MSG, ex);      
    }
@@ -83,7 +89,7 @@
     */
    Object get(Fqn<?> fqn, String id, boolean gravitate)
    {
-      TimeoutException ex = null;
+      CacheException ex = null;
       for (int i = 0; i < RETRY; i++)
       {
          try
@@ -99,6 +105,10 @@
          {
             ex = e;
          }
+         catch (SuspectException e)
+         {
+            ex = e;
+         }
       }
       
       throw new RuntimeException(RETRY_FAIL_MSG, ex);
@@ -114,7 +124,7 @@
     */
    void put(Fqn<?> fqn, String id, Object value)
    {
-      TimeoutException ex = null;
+      CacheException ex = null;
       for (int i = 0; i < RETRY; i++)
       {
          try
@@ -126,6 +136,10 @@
          {
             ex = e;
          }
+         catch (SuspectException e)
+         {
+            ex = e;
+         }
       }
       
       throw new RuntimeException(RETRY_FAIL_MSG, ex);
@@ -140,7 +154,7 @@
     */
    void put(Fqn<?> fqn, Map<Object, Object> map)
    {
-      TimeoutException ex = null;
+      CacheException ex = null;
       for (int i = 0; i < RETRY; i++)
       {
          try
@@ -152,6 +166,10 @@
          {
             ex = e;
          }
+         catch (SuspectException e)
+         {
+            ex = e;
+         }
       }
       
       throw new RuntimeException(RETRY_FAIL_MSG, ex);
@@ -166,7 +184,7 @@
     */
    Object remove(Fqn<?> fqn, String id)
    {
-      TimeoutException ex = null;
+      CacheException ex = null;
       for (int i = 0; i < RETRY; i++)
       {
          try
@@ -177,6 +195,10 @@
          {
             ex = e;
          }
+         catch (SuspectException e)
+         {
+            ex = e;
+         }
       }
       
       throw new RuntimeException(RETRY_FAIL_MSG, ex);
@@ -216,7 +238,7 @@
     */
    void remove(Fqn<?> fqn)
    {
-      TimeoutException ex = null;
+      CacheException ex = null;
       for (int i = 0; i < RETRY; i++)
       {
          try
@@ -228,6 +250,10 @@
          {
             ex = e;
          }
+         catch (SuspectException e)
+         {
+            ex = e;
+         }
       }
       
       throw new RuntimeException(RETRY_FAIL_MSG, ex);