[ignite] branch master updated: IGNITE-12463 Fix failed compilation after concurrent merge

[agoncharuk]

This is an automated email from the ASF dual-hosted git repository.

agoncharuk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
     new f4a42b7  IGNITE-12463 Fix failed compilation after concurrent merge
f4a42b7 is described below

commit f4a42b7d4d70d55ae8b391cc91cf52e874f32c0a
Author: Alexey Goncharuk <alexey.goncha...@gmail.com>
AuthorDate: Mon Jan 20 16:35:47 2020 +0300

    IGNITE-12463 Fix failed compilation after concurrent merge
---
 .../ignite/compatibility/persistence/MetaStorageCompatibilityTest.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/MetaStorageCompatibilityTest.java
 
b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/MetaStorageCompatibilityTest.java
index 0933808..300060d 100644
--- 
a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/MetaStorageCompatibilityTest.java
+++ 
b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/MetaStorageCompatibilityTest.java
@@ -29,6 +29,7 @@ import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.internal.IgniteEx;
 import org.apache.ignite.internal.IgnitionEx;
 import 
org.apache.ignite.internal.processors.cache.GridCacheAbstractFullApiSelfTest;
+import org.apache.ignite.internal.processors.cache.persistence.CheckpointState;
 import 
org.apache.ignite.internal.processors.cache.persistence.GridCacheDatabaseSharedManager;
 import org.apache.ignite.internal.processors.cache.persistence.file.FileIO;
 import 
org.apache.ignite.internal.processors.cache.persistence.file.FileIODecorator;
@@ -264,7 +265,7 @@ public class MetaStorageCompatibilityTest extends 
IgnitePersistenceCompatibility
                 ignite.active(true);
 
                 ((IgniteEx)ignite).context().cache().context().database()
-                    .forceCheckpoint("force test 
checkpoint").finishFuture().get();
+                    .forceCheckpoint("force test 
checkpoint").futureFor(CheckpointState.FINISHED).get();
 
                 
((GridCacheDatabaseSharedManager)(((IgniteEx)ignite).context().cache().context().database()))
                     .enableCheckpoints(false);