[jbosscache-commits] JBoss Cache SVN: r8156 - core/trunk/src/main/java/org/jboss/cache/interceptors.

[jbosscache-commits at lists.jboss.org]

Author: bstansberry at jboss.com
Date: 2009-08-05 18:06:43 -0400 (Wed, 05 Aug 2009)
New Revision: 8156

Modified:
   core/trunk/src/main/java/org/jboss/cache/interceptors/LegacyDataGravitatorInterceptor.java
Log:
[JBCACHE-1529] Don't log ERROR for a RequestIgnoredResponse

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/LegacyDataGravitatorInterceptor.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/interceptors/LegacyDataGravitatorInterceptor.java	2009-08-05 16:47:21 UTC (rev 8155)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/LegacyDataGravitatorInterceptor.java	2009-08-05 22:06:43 UTC (rev 8156)
@@ -46,6 +46,7 @@
 import org.jboss.cache.commands.tx.RollbackCommand;
 import org.jboss.cache.factories.annotations.Inject;
 import org.jboss.cache.marshall.NodeData;
+import org.jboss.cache.marshall.RequestIgnoredResponse;
 import org.jboss.cache.transaction.GlobalTransaction;
 import org.jgroups.Address;
 import org.jgroups.blocks.GroupRequest;
@@ -375,21 +376,28 @@
                log.debug("Found remote Throwable among responses - removing from responses list", (Exception) o);
             }
          }
-         else if (o != null && o instanceof GravitateResult)
+         else if (o instanceof GravitateResult)
          {
             result = (GravitateResult) o;
             if (result.isDataFound())
             {
                break;
             }
-         }
-         else if (!configuration.isUseRegionBasedMarshalling())
+         } 
+         else if (o == null)
          {
             // Null is OK if we are using region based marshalling; it
             // is what is returned if a region is inactive. Otherwise
             // getting a null is an error condition
-            log.error("Unexpected null response to call " + command + ".");
+            if (!configuration.isUseRegionBasedMarshalling())
+            {
+               log.error("Unexpected null response to call " + command + ".");
+            }
          }
+         else if ((o instanceof RequestIgnoredResponse) == false)
+         {
+            log.error("Unexpected response " + o + " to call " + command + ".");
+         } 
 
       }