ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [22/26] ignite git commit: IGNITE-6334 Fixed compilation after conflict
Date Fri, 22 Sep 2017 11:19:53 GMT
IGNITE-6334 Fixed compilation after conflict


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

Branch: refs/heads/ignite-3478
Commit: e3d448e6c23df67b15f8cf7545b4754807acac32
Parents: 9f662cc
Author: Alexey Goncharuk <alexey.goncharuk@gmail.com>
Authored: Fri Sep 22 13:12:15 2017 +0300
Committer: Alexey Goncharuk <alexey.goncharuk@gmail.com>
Committed: Fri Sep 22 13:12:31 2017 +0300

----------------------------------------------------------------------
 .../persistence/pagemem/PagesWriteThrottleSmokeTest.java | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/e3d448e6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PagesWriteThrottleSmokeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PagesWriteThrottleSmokeTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PagesWriteThrottleSmokeTest.java
index 12a601d..f4f21ef 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PagesWriteThrottleSmokeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PagesWriteThrottleSmokeTest.java
@@ -20,6 +20,7 @@ import java.io.File;
 import java.io.IOException;
 import java.io.Serializable;
 import java.nio.ByteBuffer;
+import java.nio.file.OpenOption;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.locks.LockSupport;
@@ -50,6 +51,10 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 
+import static java.nio.file.StandardOpenOption.CREATE;
+import static java.nio.file.StandardOpenOption.READ;
+import static java.nio.file.StandardOpenOption.WRITE;
+
 /**
  *
  */
@@ -288,12 +293,12 @@ public class PagesWriteThrottleSmokeTest extends GridCommonAbstractTest
{
 
         /** {@inheritDoc} */
         @Override public FileIO create(File file) throws IOException {
-            return create(file, "rw");
+            return create(file, CREATE, READ, WRITE);
         }
 
         /** {@inheritDoc} */
-        @Override public FileIO create(File file, String mode) throws IOException {
-            final FileIO delegate = delegateFactory.create(file, mode);
+        @Override public FileIO create(File file, OpenOption... openOption) throws IOException
{
+            final FileIO delegate = delegateFactory.create(file, openOption);
 
             return new FileIODecorator(delegate) {
                 @Override public int write(ByteBuffer srcBuf) throws IOException {


Mime
View raw message