Ignite-67 properties fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4e69eb05 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4e69eb05 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4e69eb05 Branch: refs/heads/ignite-67 Commit: 4e69eb05e3cea4d13e3b5bdcfe772dd56924db58 Parents: bc3f2ef Author: avinogradov <avinogra...@gridgain.com> Authored: Wed Jan 28 16:57:49 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Wed Jan 28 16:57:49 2015 +0300 ---------------------------------------------------------------------- .../consistenthash/CacheConsistentHashAffinityFunction.java | 2 +- .../apache/ignite/testframework/config/GridTestProperties.java | 2 +- .../src/main/java/org/apache/ignite/hadoop/GridHadoopSetup.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4e69eb05/modules/core/src/main/java/org/apache/ignite/cache/affinity/consistenthash/CacheConsistentHashAffinityFunction.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/affinity/consistenthash/CacheConsistentHashAffinityFunction.java b/modules/core/src/main/java/org/apache/ignite/cache/affinity/consistenthash/CacheConsistentHashAffinityFunction.java index 3305534..12d0235 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/affinity/consistenthash/CacheConsistentHashAffinityFunction.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/affinity/consistenthash/CacheConsistentHashAffinityFunction.java @@ -62,7 +62,7 @@ public class CacheConsistentHashAffinityFunction implements CacheAffinityFunctio private static final long serialVersionUID = 0L; /** Flag to enable/disable consistency check (for internal use only). */ - private static final boolean AFFINITY_CONSISTENCY_CHECK = Boolean.getBoolean("GRIDGAIN_AFFINITY_CONSISTENCY_CHECK"); + private static final boolean AFFINITY_CONSISTENCY_CHECK = Boolean.getBoolean("IGNITE_AFFINITY_CONSISTENCY_CHECK"); /** Default number of partitions. */ public static final int DFLT_PARTITION_COUNT = 10000; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4e69eb05/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java b/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java index e5df607..b5e8e15 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java @@ -83,7 +83,7 @@ public final class GridTestProperties { dfltProps = Collections.unmodifiableMap(loadFromFile(new HashMap<String, String>(), cfgFile)); - if ("false".equals(System.getProperty("GRIDGAIN_TEST_PROP_DISABLE_LOG4J", "false"))) { + if ("false".equals(System.getProperty("IGNITE_TEST_PROP_DISABLE_LOG4J", "false"))) { String user = System.getProperty("user.name"); assert user != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4e69eb05/modules/hadoop/src/main/java/org/apache/ignite/hadoop/GridHadoopSetup.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/GridHadoopSetup.java b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/GridHadoopSetup.java index 66343ba..0fbfdf7 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/GridHadoopSetup.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/GridHadoopSetup.java @@ -377,7 +377,7 @@ public class GridHadoopSetup { String answer = null; - if (!F.isEmpty(System.getenv("GRIDGAIN_HADOOP_SETUP_YES"))) + if (!F.isEmpty(System.getenv("IGNITE_HADOOP_SETUP_YES"))) answer = "Y"; else { BufferedReader br = new BufferedReader(new InputStreamReader(System.in)); @@ -412,7 +412,7 @@ public class GridHadoopSetup { X.println(" # " + msg); X.println(" # Setup failed, exiting... "); - if (e != null && !F.isEmpty(System.getenv("GRIDGAIN_HADOOP_SETUP_DEBUG"))) + if (e != null && !F.isEmpty(System.getenv("IGNITE_HADOOP_SETUP_DEBUG"))) e.printStackTrace(); System.exit(1);
