geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From upthewatersp...@apache.org
Subject [27/50] [abbrv] incubator-geode git commit: GEODE-279: fix hang caused by unhandled exception
Date Wed, 09 Sep 2015 23:59:10 GMT
GEODE-279: fix hang caused by unhandled exception


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

Branch: refs/heads/feature/GEODE-12
Commit: 01e8b5ecdadbce760939578e23ad6d4e5ef2c1c5
Parents: 39d35da
Author: Darrel Schneider <dschneider@pivotal.io>
Authored: Tue Aug 25 11:16:06 2015 -0700
Committer: Darrel Schneider <dschneider@pivotal.io>
Committed: Tue Aug 25 11:16:06 2015 -0700

----------------------------------------------------------------------
 .../gemstone/gemfire/internal/cache/DistributedCacheOperation.java | 2 +-
 .../gemfire/internal/cache/partitioned/PartitionMessage.java       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/01e8b5ec/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedCacheOperation.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedCacheOperation.java
b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedCacheOperation.java
index d557be6..692595c 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedCacheOperation.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedCacheOperation.java
@@ -1531,7 +1531,7 @@ public abstract class DistributedCacheOperation {
           return false;
         }
         return lr.notifiesMultipleSerialGateways();
-      } catch (CancelException ignore) {
+      } catch (RuntimeException ignore) {
         return false;
       } finally {
         LocalRegion.setThreadInitLevelRequirement(oldLevel);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/01e8b5ec/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionMessage.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionMessage.java
b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionMessage.java
index 019740f..daa99c0 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionMessage.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionMessage.java
@@ -682,7 +682,7 @@ public abstract class PartitionMessage extends DistributionMessage implements
       return pr.notifiesMultipleSerialGateways();
     } catch (PRLocallyDestroyedException e) {
       return false;
-    } catch (CancelException ignore) {
+    } catch (RuntimeException ignore) {
       return false;
     }
   }


Mime
View raw message