You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2015/06/16 15:11:41 UTC
[1/3] incubator-ignite git commit: # ignite-sprint-6 tests fixes
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-gg-dotnetclientmode 0c188ad46 -> 304c45401
# ignite-sprint-6 tests fixes
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a9228c07
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a9228c07
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a9228c07
Branch: refs/heads/ignite-gg-dotnetclientmode
Commit: a9228c07aa125613df45af226fe133b93c8c2783
Parents: 5b9013f
Author: sboikov <sb...@gridgain.com>
Authored: Tue Jun 16 15:02:21 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Jun 16 15:02:21 2015 +0300
----------------------------------------------------------------------
.../cache/GridCacheMultinodeUpdateAbstractSelfTest.java | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9228c07/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateAbstractSelfTest.java
index ddf42e3..4152229 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateAbstractSelfTest.java
@@ -33,6 +33,7 @@ import static org.apache.ignite.cache.CacheMode.*;
/**
* Multinode update test.
*/
+@SuppressWarnings("unchecked")
public abstract class GridCacheMultinodeUpdateAbstractSelfTest extends GridCacheAbstractSelfTest {
/** */
protected static volatile boolean failed;
@@ -52,6 +53,7 @@ public abstract class GridCacheMultinodeUpdateAbstractSelfTest extends GridCache
return 3 * 60_000;
}
+ /** {@inheritDoc} */
@Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception {
CacheConfiguration ccfg = super.cacheConfiguration(gridName);
@@ -62,6 +64,13 @@ public abstract class GridCacheMultinodeUpdateAbstractSelfTest extends GridCache
return ccfg;
}
+ /** {@inheritDoc} */
+ @Override protected void beforeTest() throws Exception {
+ super.beforeTest();
+
+ failed = false;
+ }
+
/**
* @throws Exception If failed.
*/
[2/3] incubator-ignite git commit: Merge branch 'ignite-sprint-6'
into ignite-gg-dotnetclientmode
Posted by vo...@apache.org.
Merge branch 'ignite-sprint-6' into ignite-gg-dotnetclientmode
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7e119787
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7e119787
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7e119787
Branch: refs/heads/ignite-gg-dotnetclientmode
Commit: 7e119787599bdfbcffa55cca8194fecdcd5cce44
Parents: 0c188ad a9228c0
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Tue Jun 16 16:00:54 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Tue Jun 16 16:00:54 2015 +0300
----------------------------------------------------------------------
.../cache/GridCacheMultinodeUpdateAbstractSelfTest.java | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
[3/3] incubator-ignite git commit: # GG-10428: Review/cosmetics.
Posted by vo...@apache.org.
# GG-10428: Review/cosmetics.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/304c4540
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/304c4540
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/304c4540
Branch: refs/heads/ignite-gg-dotnetclientmode
Commit: 304c4540128de4f69fa6346c8649fad2402fdfb6
Parents: 7e11978
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Tue Jun 16 16:12:00 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Tue Jun 16 16:12:00 2015 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/internal/interop/InteropBootstrap.java | 1 +
.../java/org/apache/ignite/internal/interop/InteropIgnition.java | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/304c4540/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropBootstrap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropBootstrap.java b/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropBootstrap.java
index 56c0da5..df5af6c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropBootstrap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropBootstrap.java
@@ -28,6 +28,7 @@ public interface InteropBootstrap {
*
* @param cfg Configuration.
* @param envPtr Environment pointer.
+ * @param dataPtr Optional pointer to additional data required for startup.
* @return Ignite node.
*/
public InteropProcessor start(IgniteConfiguration cfg, long envPtr, long dataPtr);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/304c4540/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropIgnition.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropIgnition.java b/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropIgnition.java
index fc74638..fb0d6e1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropIgnition.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropIgnition.java
@@ -45,10 +45,11 @@ public class InteropIgnition {
* @param gridName Grid name.
* @param factoryId Factory ID.
* @param envPtr Environment pointer.
+ * @param dataPtr Optional pointer to additional data required for startup.
* @return Ignite instance.
*/
public static synchronized InteropProcessor start(@Nullable String springCfgPath, @Nullable String gridName,
- int factoryId, long dataPtr, long envPtr) {
+ int factoryId, long envPtr, long dataPtr) {
IgniteConfiguration cfg = configuration(springCfgPath);
if (gridName != null)