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/08/20 13:40:17 UTC

[1/2] incubator-ignite git commit: # ignite-1.3.3-p3 exchange manager can return null affinityReadyFuture

Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-1.3.3-p3 afadd36c2 -> abbd308da


# ignite-1.3.3-p3 exchange manager can return null affinityReadyFuture


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

Branch: refs/heads/ignite-1.3.3-p3
Commit: d78e8bcc820268f7244dea021258978d46d4b411
Parents: 2054f19
Author: sboikov <sb...@gridgain.com>
Authored: Thu Aug 20 14:25:11 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Aug 20 14:25:11 2015 +0300

----------------------------------------------------------------------
 .../ignite/internal/processors/cache/GridCacheSharedContext.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d78e8bcc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
index f7763ec..6562257 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
@@ -455,7 +455,9 @@ public class GridCacheSharedContext<K, V> {
 
         AffinityTopologyVersion nextVer = new AffinityTopologyVersion(curVer.topologyVersion() + 1);
 
-        return exchMgr.affinityReadyFuture(nextVer);
+        IgniteInternalFuture<?> fut = exchMgr.affinityReadyFuture(nextVer);
+
+        return fut == null ? new GridFinishedFuture<>() : fut;
     }
 
     /**


[2/2] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-1.3.3-p3' into ignite-1.3.3-p3

Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/ignite-1.3.3-p3' into ignite-1.3.3-p3


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

Branch: refs/heads/ignite-1.3.3-p3
Commit: abbd308da5ce8ef5260b511e41e6b394e1877d8b
Parents: d78e8bc afadd36
Author: sboikov <sb...@gridgain.com>
Authored: Thu Aug 20 14:40:05 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Aug 20 14:40:05 2015 +0300

----------------------------------------------------------------------
 .../cache/store/jdbc/CacheJdbcPojoStore.java    |  20 +--
 .../store/jdbc/CacheJdbcPojoStoreTest.java      |  24 ++-
 .../ignite/schema/model/PojoDescriptor.java     |   6 +-
 .../ignite/schema/model/SchemaDescriptor.java   |  61 +++++++
 .../schema/parser/DatabaseMetadataParser.java   |  54 +++++--
 .../parser/dialect/DB2MetadataDialect.java      |   3 +-
 .../parser/dialect/DatabaseMetadataDialect.java |  13 +-
 .../parser/dialect/JdbcMetadataDialect.java     | 129 +++++++++------
 .../parser/dialect/MySQLMetadataDialect.java    |  57 +++++++
 .../parser/dialect/OracleMetadataDialect.java   | 111 +++++++++----
 .../org/apache/ignite/schema/ui/Controls.java   |  25 ++-
 .../ignite/schema/ui/SchemaImportApp.java       | 157 ++++++++++++++++---
 .../schema/test/AbstractSchemaImportTest.java   |  10 +-
 .../jdbc/CacheJdbcPojoStoreFactorySelfTest.java |   3 -
 14 files changed, 535 insertions(+), 138 deletions(-)
----------------------------------------------------------------------