geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jasonhu...@apache.org
Subject incubator-geode git commit: GEODE-481: CI failure: QueryUsingFunctionContextDUnitTest.testQueriesWithFilterKeysOnPRWithBucketDestroy
Date Thu, 18 Feb 2016 00:33:04 GMT
Repository: incubator-geode
Updated Branches:
  refs/heads/develop 456938795 -> 92be457c6


GEODE-481: CI failure: QueryUsingFunctionContextDUnitTest.testQueriesWithFilterKeysOnPRWithBucketDestroy

The error handling for functions is different depending on if it failed locally or remotely.
In this case, the function was failing on the remote node and the try/catch block would have
it send
the exception, however there are two types of send exception calls.
We needed it to use the result sender's way to send the exception (possibly less header data)


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/92be457c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/92be457c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/92be457c

Branch: refs/heads/develop
Commit: 92be457c6ca230e588cbd053b34c796d8f924e0a
Parents: 4569387
Author: Jason Huynh <huynhja@gmail.com>
Authored: Thu Feb 11 10:01:48 2016 -0800
Committer: Jason Huynh <huynhja@gmail.com>
Committed: Wed Feb 17 16:38:11 2016 -0800

----------------------------------------------------------------------
 .../cache/tier/sockets/command/ExecuteRegionFunction66.java | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/92be457c/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteRegionFunction66.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteRegionFunction66.java
b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteRegionFunction66.java
index 6d9ca49..018d05b 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteRegionFunction66.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteRegionFunction66.java
@@ -23,13 +23,12 @@ import java.util.Set;
 
 import com.gemstone.gemfire.cache.Region;
 import com.gemstone.gemfire.cache.client.internal.ExecuteFunctionHelper;
-import com.gemstone.gemfire.cache.client.internal.Op;
 import com.gemstone.gemfire.cache.execute.Function;
 import com.gemstone.gemfire.cache.execute.FunctionException;
 import com.gemstone.gemfire.cache.execute.FunctionInvocationTargetException;
 import com.gemstone.gemfire.cache.execute.FunctionService;
 import com.gemstone.gemfire.cache.operations.ExecuteFunctionOperationContext;
-import com.gemstone.gemfire.i18n.LogWriterI18n;
+import com.gemstone.gemfire.cache.query.QueryInvocationTargetException;
 import com.gemstone.gemfire.internal.Version;
 import com.gemstone.gemfire.internal.cache.DistributedRegion;
 import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
@@ -299,9 +298,9 @@ public class ExecuteRegionFunction66 extends BaseCommand {
       }
       catch (FunctionException fe) {
         String message = fe.getMessage();
-
-        if (fe.getCause() instanceof FunctionInvocationTargetException) {
-          if (fe.getCause() instanceof InternalFunctionInvocationTargetException) {
+        Object cause = fe.getCause();
+        if (cause instanceof FunctionInvocationTargetException || cause instanceof QueryInvocationTargetException)
{
+          if (cause instanceof InternalFunctionInvocationTargetException) {
             // Fix for #44709: User should not be aware of
             // InternalFunctionInvocationTargetException. No instance of
             // InternalFunctionInvocationTargetException is giving useful


Mime
View raw message