You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by yz...@apache.org on 2017/10/13 17:43:17 UTC
[32/50] [abbrv] ignite git commit: IGNITE-6334 Fixed compilation
after conflict
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/24f904e6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/24f904e6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/24f904e6
Branch: refs/heads/ignite-2.1.5-p1
Commit: 24f904e6af7d17111bc9ec273d6555b70057e25c
Parents: 520c2e3
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Fri Sep 22 13:12:15 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Fri Sep 22 13:13:03 2017 +0300
----------------------------------------------------------------------
.../persistence/pagemem/PagesWriteThrottleSmokeTest.java | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/24f904e6/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 {