IGNITE-389 - Fixing shmem tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2c3acf0e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2c3acf0e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2c3acf0e Branch: refs/heads/ignite-883-1 Commit: 2c3acf0e7747fee9bc565b74670e43d9858c5387 Parents: 3d1e534 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Mon Jun 8 16:27:31 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Mon Jun 8 16:27:31 2015 -0700 ---------------------------------------------------------------------- .../java/org/apache/ignite/internal/util/GridJavaProcess.java | 2 +- .../ignite/internal/util/nio/GridShmemCommunicationClient.java | 5 ----- .../internal/util/ipc/shmem/IgfsSharedMemoryTestServer.java | 2 ++ 3 files changed, 3 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2c3acf0e/modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java index 42fe089..4946eb2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java @@ -138,7 +138,7 @@ public final class GridJavaProcess { procCommands.add(javaBin); procCommands.addAll(jvmArgs == null ? U.jvmArgs() : jvmArgs); - if (!jvmArgs.contains("-cp") && !jvmArgs.contains("-classpath")) { + if (jvmArgs == null || (!jvmArgs.contains("-cp") && !jvmArgs.contains("-classpath"))) { String classpath = System.getProperty("java.class.path"); String sfcp = System.getProperty("surefire.test.class.path"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2c3acf0e/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridShmemCommunicationClient.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridShmemCommunicationClient.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridShmemCommunicationClient.java index f3dc46f..e05c37a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridShmemCommunicationClient.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridShmemCommunicationClient.java @@ -140,11 +140,6 @@ public class GridShmemCommunicationClient extends GridAbstractCommunicationClien } /** {@inheritDoc} */ - @Override public void flushIfNeeded(long timeout) throws IOException { - // No-op. - } - - /** {@inheritDoc} */ @Override public String toString() { return S.toString(GridShmemCommunicationClient.class, this, super.toString()); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2c3acf0e/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IgfsSharedMemoryTestServer.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IgfsSharedMemoryTestServer.java b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IgfsSharedMemoryTestServer.java index 1a8fd10..e220031 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IgfsSharedMemoryTestServer.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IgfsSharedMemoryTestServer.java @@ -49,6 +49,8 @@ public class IgfsSharedMemoryTestServer { srv.start(); + System.out.println("IPC shared memory server endpoint started"); + IpcEndpoint clientEndpoint = srv.accept(); is = clientEndpoint.inputStream();
