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/09/08 10:14:42 UTC
[1/2] ignite git commit: Partial fix for ignite-1355 to avoid errors
in tests setup.
Repository: ignite
Updated Branches:
refs/heads/ignite-1.4 97fe836b9 -> 5264ec738
Partial fix for ignite-1355 to avoid errors in tests setup.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/02fc057e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/02fc057e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/02fc057e
Branch: refs/heads/ignite-1.4
Commit: 02fc057ee885ef70ed645d993d7e3cd7488d3888
Parents: bbfee45
Author: sboikov <sb...@gridgain.com>
Authored: Tue Sep 8 10:38:01 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Sep 8 10:38:01 2015 +0300
----------------------------------------------------------------------
.../internal/processors/affinity/GridAffinityProcessor.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/02fc057e/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java
index 090aca0..8f66dc1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java
@@ -296,7 +296,7 @@ public class GridAffinityProcessor extends GridProcessorAdapter {
* @throws IgniteCheckedException In case of error.
*/
@SuppressWarnings("ErrorNotRethrown")
- private AffinityInfo affinityCache(@Nullable final String cacheName, AffinityTopologyVersion topVer)
+ @Nullable private AffinityInfo affinityCache(@Nullable final String cacheName, AffinityTopologyVersion topVer)
throws IgniteCheckedException {
AffinityAssignmentKey key = new AffinityAssignmentKey(cacheName, topVer);
@@ -879,7 +879,9 @@ public class GridAffinityProcessor extends GridProcessorAdapter {
ctx.gateway().readLock();
try {
- return cache().assignment().get(part);
+ AffinityInfo cache = cache();
+
+ return cache != null ? cache.assignment().get(part) : Collections.<ClusterNode>emptyList();
}
catch (IgniteCheckedException e) {
throw new IgniteException(e);
@@ -893,7 +895,7 @@ public class GridAffinityProcessor extends GridProcessorAdapter {
* @return Affinity info for current topology version.
* @throws IgniteCheckedException If failed.
*/
- private AffinityInfo cache() throws IgniteCheckedException {
+ @Nullable private AffinityInfo cache() throws IgniteCheckedException {
return affinityCache(cacheName, new AffinityTopologyVersion(topologyVersion()));
}
[2/2] ignite git commit: Merge remote-tracking branch
'origin/ignite-1.4' into ignite-1.4
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/ignite-1.4' into ignite-1.4
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5264ec73
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5264ec73
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5264ec73
Branch: refs/heads/ignite-1.4
Commit: 5264ec7385915fc0884afe31dba7e83a86335027
Parents: 02fc057 97fe836
Author: sboikov <sb...@gridgain.com>
Authored: Tue Sep 8 11:14:36 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Sep 8 11:14:36 2015 +0300
----------------------------------------------------------------------
.../ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------