You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2017/04/06 10:46:32 UTC
[1/2] ignite git commit: ignite-3477-master fix testServerNodeLeft
Repository: ignite
Updated Branches:
refs/heads/ignite-3477-master 03183a9ab -> cf06bad24
ignite-3477-master fix testServerNodeLeft
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0c0d905c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0c0d905c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0c0d905c
Branch: refs/heads/ignite-3477-master
Commit: 0c0d905c3863e9533b416dfec697dfbba4d9326c
Parents: dbe7782
Author: Dmitriy Govorukhin <dg...@gridgain.com>
Authored: Thu Apr 6 11:29:58 2017 +0300
Committer: Dmitriy Govorukhin <dg...@gridgain.com>
Committed: Thu Apr 6 11:29:58 2017 +0300
----------------------------------------------------------------------
.../IgniteCacheContinuousQueryClientTest.java | 23 +++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0c0d905c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryClientTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryClientTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryClientTest.java
index ade04fb..ae5a2d6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryClientTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryClientTest.java
@@ -22,6 +22,7 @@ import javax.cache.event.CacheEntryEvent;
import javax.cache.event.CacheEntryUpdatedListener;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteClientDisconnectedException;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.cache.query.ContinuousQuery;
import org.apache.ignite.cache.query.QueryCursor;
@@ -246,7 +247,27 @@ public class IgniteCacheContinuousQueryClientTest extends GridCommonAbstractTest
stopGrid(srv);
}
- cur.close();
+ tryClose(cur);
+ }
+
+ /**
+ * @param cur Cur.
+ */
+ private void tryClose(QueryCursor<?> cur) {
+ try {
+ cur.close();
+ }
+ catch (Throwable e) {
+ if (e instanceof IgniteClientDisconnectedException) {
+ IgniteClientDisconnectedException ex = (IgniteClientDisconnectedException)e;
+
+ ex.reconnectFuture().get();
+
+ cur.close();
+ }
+ else
+ throw e;
+ }
}
/**
[2/2] ignite git commit: Merge branch 'ignite-3477-master' of
https://github.com/gridgain/apache-ignite into ignite-3477-master
Posted by ag...@apache.org.
Merge branch 'ignite-3477-master' of https://github.com/gridgain/apache-ignite into ignite-3477-master
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cf06bad2
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cf06bad2
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cf06bad2
Branch: refs/heads/ignite-3477-master
Commit: cf06bad240f60c4cebc2153bae3d0dcaba4120f4
Parents: 03183a9 0c0d905
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Thu Apr 6 13:46:11 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Thu Apr 6 13:46:11 2017 +0300
----------------------------------------------------------------------
.../IgniteCacheContinuousQueryClientTest.java | 23 +++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
----------------------------------------------------------------------