ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject ignite git commit: ignite-1.5 Fixed hang on metadata update inside put in atomic cache when topology read lock is held.
Date Mon, 21 Dec 2015 13:30:50 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-1537 f1e3939ad -> 896ff6cd6


ignite-1.5 Fixed hang on metadata update inside put in atomic cache when topology read lock
is held.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/896ff6cd
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/896ff6cd
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/896ff6cd

Branch: refs/heads/ignite-1537
Commit: 896ff6cd657b96c41757865ce5b89bde086a89e4
Parents: f1e3939
Author: sboikov <sboikov@gridgain.com>
Authored: Mon Dec 21 16:30:41 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Mon Dec 21 16:30:41 2015 +0300

----------------------------------------------------------------------
 .../java/org/apache/ignite/cache/websession/WebSessionFilter.java | 3 ++-
 .../org/apache/ignite/cache/websession/WebSessionListener.java    | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/896ff6cd/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionFilter.java
----------------------------------------------------------------------
diff --git a/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionFilter.java
b/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionFilter.java
index d060884..c3a3b32 100644
--- a/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionFilter.java
+++ b/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionFilter.java
@@ -38,6 +38,7 @@ import org.apache.ignite.IgniteCache;
 import org.apache.ignite.IgniteException;
 import org.apache.ignite.IgniteLogger;
 import org.apache.ignite.IgniteTransactions;
+import org.apache.ignite.binary.BinaryObjectException;
 import org.apache.ignite.cluster.ClusterTopologyException;
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.internal.util.typedef.C1;
@@ -433,7 +434,7 @@ public class WebSessionFilter implements Filter {
 
                 break;
             }
-            catch (CacheException e) {
+            catch (CacheException | BinaryObjectException e) {
                 if (log.isDebugEnabled())
                     log.debug(e.getMessage());
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/896ff6cd/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionListener.java
----------------------------------------------------------------------
diff --git a/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionListener.java
b/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionListener.java
index 89e56bd..a1c1106 100644
--- a/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionListener.java
+++ b/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionListener.java
@@ -32,6 +32,7 @@ import org.apache.ignite.Ignite;
 import org.apache.ignite.IgniteCache;
 import org.apache.ignite.IgniteException;
 import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.binary.BinaryObjectException;
 import org.apache.ignite.cluster.ClusterTopologyException;
 import org.apache.ignite.internal.IgniteInterruptedCheckedException;
 import org.apache.ignite.internal.util.typedef.T2;
@@ -120,7 +121,7 @@ class WebSessionListener {
 
                     break;
                 }
-                catch (CacheException e) {
+                catch (CacheException | BinaryObjectException e) {
                     if (i == retries - 1) {
                         U.warn(log, "Failed to apply updates for session (maximum number
of retries exceeded) [sesId=" +
                             sesId + ", retries=" + retries + ']');


Mime
View raw message