You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/06/24 10:27:49 UTC
[09/10] incubator-ignite git commit: Merge branch 'ignite-sprint-6'
into ignite-yardstick-client
Merge branch 'ignite-sprint-6' into ignite-yardstick-client
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d7af8f27
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d7af8f27
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d7af8f27
Branch: refs/heads/ignite-yardstick-client
Commit: d7af8f2759d830574c7098f4714c6cc263229633
Parents: 87c7df7 285d790
Author: nikolay_tikhonov <nt...@gridgain.com>
Authored: Wed Jun 24 11:25:04 2015 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
Committed: Wed Jun 24 11:25:04 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/IgniteSystemProperties.java | 3 +
.../ignite/internal/MarshallerContextImpl.java | 12 +-
.../GridDhtPartitionsExchangeFuture.java | 49 ++++++--
.../communication/tcp/TcpCommunicationSpi.java | 61 ++++++----
.../tcp/TcpCommunicationSpiMBean.java | 8 ++
.../ignite/spi/discovery/tcp/ClientImpl.java | 68 +++++++----
.../cache/GridCacheDaemonNodeStopSelfTest.java | 119 +++++++++++++++++++
.../GridTcpCommunicationSpiConfigSelfTest.java | 1 -
.../testsuites/IgniteCacheTestSuite3.java | 1 +
.../cache/IgniteCacheOffheapEvictQueryTest.java | 17 +++
10 files changed, 278 insertions(+), 61 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d7af8f27/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
index 77d7160,0c2c059..7961a71
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
@@@ -650,10 -671,8 +676,10 @@@ class ClientImpl extends TcpDiscoveryIm
private void joinError(IgniteSpiException err) {
assert err != null;
- joinErr = err;
+ joinErr.compareAndSet(null, err);
+ log.error("ClientImpl.joinError", err);
+
joinLatch.countDown();
}