Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 035D1200D01 for ; Fri, 22 Sep 2017 13:19:37 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 0181E1609A7; Fri, 22 Sep 2017 11:19:37 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id A243E1609BE for ; Fri, 22 Sep 2017 13:19:35 +0200 (CEST) Received: (qmail 58889 invoked by uid 500); 22 Sep 2017 11:19:34 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 58531 invoked by uid 99); 22 Sep 2017 11:19:34 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Sep 2017 11:19:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 58A49F5AA2; Fri, 22 Sep 2017 11:19:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Date: Fri, 22 Sep 2017 11:19:53 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [22/26] ignite git commit: IGNITE-6334 Fixed compilation after conflict archived-at: Fri, 22 Sep 2017 11:19:37 -0000 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 Authored: Fri Sep 22 13:12:15 2017 +0300 Committer: Alexey Goncharuk 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 {