Repository: incubator-ignite Updated Branches: refs/heads/ignite-218 274ecd44d -> 4240ce03b
[ingite-218]: fixing 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/4240ce03 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4240ce03 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4240ce03 Branch: refs/heads/ignite-218 Commit: 4240ce03b56f558578e3bfbe0eb239b563cf08c5 Parents: 274ecd4 Author: iveselovskiy <[email protected]> Authored: Fri Apr 17 17:03:32 2015 +0300 Committer: iveselovskiy <[email protected]> Committed: Fri Apr 17 17:03:32 2015 +0300 ---------------------------------------------------------------------- .../internal/util/ipc/shmem/IpcSharedMemoryServerEndpoint.java | 2 +- .../java/org/apache/ignite/testsuites/IgniteHadoopTestSuite.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4240ce03/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryServerEndpoint.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryServerEndpoint.java b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryServerEndpoint.java index 4f43474..8243c9b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryServerEndpoint.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryServerEndpoint.java @@ -592,7 +592,7 @@ public class IpcSharedMemoryServerEndpoint implements IpcServerEndpoint { if (log.isDebugEnabled()) log.debug("Token directory is being processed concurrently: " + workTokDir.getAbsolutePath()); } - catch (InterruptedIOException ignored) { + catch (InterruptedIOException | FileLockInterruptionException ignored) { Thread.currentThread().interrupt(); } catch (IOException e) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4240ce03/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteHadoopTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteHadoopTestSuite.java b/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteHadoopTestSuite.java index 183087c..0ab5c5d 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteHadoopTestSuite.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteHadoopTestSuite.java @@ -48,7 +48,7 @@ public class IgniteHadoopTestSuite extends TestSuite { downloadHadoop(); downloadHive(); - HadoopClassLoader ldr = new HadoopClassLoader(null, "test"); + ClassLoader ldr = TestSuite.class.getClassLoader(); // new HadoopClassLoader(null, "test"); TestSuite suite = new TestSuite("Ignite Hadoop MR Test Suite");
