helix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s..@apache.org
Subject git commit: Remove accidental copy paste
Date Thu, 31 Jan 2013 01:38:06 GMT
Updated Branches:
  refs/heads/master 76df525f9 -> 258c7d60a


Remove accidental copy paste

Project: http://git-wip-us.apache.org/repos/asf/incubator-helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-helix/commit/258c7d60
Tree: http://git-wip-us.apache.org/repos/asf/incubator-helix/tree/258c7d60
Diff: http://git-wip-us.apache.org/repos/asf/incubator-helix/diff/258c7d60

Branch: refs/heads/master
Commit: 258c7d60ad6ce12f2f7449ca93906c861da333e7
Parents: 76df525
Author: slu2011 <lushi04@gmail.com>
Authored: Wed Jan 30 17:37:50 2013 -0800
Committer: slu2011 <lushi04@gmail.com>
Committed: Wed Jan 30 17:37:50 2013 -0800

----------------------------------------------------------------------
 .../apache/helix/manager/zk/ZKHelixManager.java    |   24 +--------------
 1 files changed, 1 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/258c7d60/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java
----------------------------------------------------------------------
diff --git a/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java b/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java
index 30a6137..eff05a3 100644
--- a/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java
+++ b/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java
@@ -151,7 +151,7 @@ public class ZKHelixManager implements HelixManager
     }
     catch (NumberFormatException e)
     {
-      logger.warn("Exception while parsing helixmanager.flappingTimeWindow: "
+      logger.warn("Exception while parsing helixmanager.maxDisconnectThreshold: "
           + System.getProperty("helixmanager.maxDisconnectThreshold", "" + MAX_DISCONNECT_THRESHOLD));
     }
     int sessionTimeoutInt = -1;
@@ -166,28 +166,6 @@ public class ZKHelixManager implements HelixManager
       logger.warn("Exception while parsing session timeout: "
           + System.getProperty("zk.session.timeout", "" + DEFAULT_SESSION_TIMEOUT));
     }
-    try
-    {
-      sessionTimeoutInt =
-          Integer.parseInt(System.getProperty("zk.session.timeout", ""
-              + DEFAULT_SESSION_TIMEOUT));
-    }
-    catch (NumberFormatException e)
-    {
-      logger.warn("Exception while parsing session timeout: "
-          + System.getProperty("zk.session.timeout", "" + DEFAULT_SESSION_TIMEOUT));
-    }
-    try
-    {
-      sessionTimeoutInt =
-          Integer.parseInt(System.getProperty("zk.session.timeout", ""
-              + DEFAULT_SESSION_TIMEOUT));
-    }
-    catch (NumberFormatException e)
-    {
-      logger.warn("Exception while parsing session timeout: "
-          + System.getProperty("zk.session.timeout", "" + DEFAULT_SESSION_TIMEOUT));
-    }
     if (sessionTimeoutInt > 0)
     {
       _sessionTimeout = sessionTimeoutInt;


Mime
View raw message