ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject incubator-ignite git commit: [IGNITE-406]: fixed compilation failures due to incoming merges
Date Thu, 12 Mar 2015 15:47:03 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-406 e74dfa68a -> 5371a8f52


[IGNITE-406]: fixed compilation failures due to incoming merges


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

Branch: refs/heads/ignite-406
Commit: 5371a8f52dc23ab713da8fcaaf7933ddeb70f03a
Parents: e74dfa6
Author: iveselovskiy <iveselovskiy@gridgain.com>
Authored: Thu Mar 12 18:46:17 2015 +0300
Committer: iveselovskiy <iveselovskiy@gridgain.com>
Committed: Thu Mar 12 18:46:17 2015 +0300

----------------------------------------------------------------------
 .../org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java   | 3 ++-
 .../java/org/apache/ignite/igfs/Hadoop1DualAbstractTest.java | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5371a8f5/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java
index 2d9d269..5ae18ef 100644
--- a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java
@@ -170,7 +170,8 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest
         }
 
         // Clean up file system.
-        igfs.format();
+        if (igfs != null)
+            igfs.format();
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5371a8f5/modules/hadoop/src/test/java/org/apache/ignite/igfs/Hadoop1DualAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/Hadoop1DualAbstractTest.java
b/modules/hadoop/src/test/java/org/apache/ignite/igfs/Hadoop1DualAbstractTest.java
index 5d52664..a328ab6 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/Hadoop1DualAbstractTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/Hadoop1DualAbstractTest.java
@@ -23,12 +23,12 @@ public abstract class Hadoop1DualAbstractTest extends IgfsDualAbstractSelfTest
{
     private static final String IGFS_NAME = "igfs_secondary";
 
     /** Secondary file system REST endpoint port */
-    private static final String PORT = "11500";
+    private static final int PORT = 11500;
 
     /** Secondary file system REST endpoint configuration map. */
-    private static final Map<String, String> SECONDARY_REST_CFG = new HashMap<String,
String>() {{
-        put("type", "tcp");
-        put("port", PORT);
+    private static final IgfsIpcEndpointConfiguration SECONDARY_REST_CFG = new IgfsIpcEndpointConfiguration()
{{
+        setType(IgfsIpcEndpointType.TCP);
+        setPort(PORT);
     }};
 
     /** Secondary file system authority. */


Mime
View raw message