You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2016/01/30 19:47:50 UTC
[11/14] storm git commit: update the same coding style
update the same coding style
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/12631e05
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/12631e05
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/12631e05
Branch: refs/heads/master
Commit: 12631e056f6b05793a151d70ec7b2ef415423e77
Parents: 12a7085
Author: xiaojian.fxj <xi...@alibaba-inc.com>
Authored: Fri Jan 29 17:39:34 2016 +0800
Committer: xiaojian.fxj <xi...@alibaba-inc.com>
Committed: Fri Jan 29 17:39:34 2016 +0800
----------------------------------------------------------------------
.../org/apache/storm/zookeeper/LeaderElectorImp.java | 14 +++++++-------
.../src/jvm/org/apache/storm/zookeeper/Zookeeper.java | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/12631e05/storm-core/src/jvm/org/apache/storm/zookeeper/LeaderElectorImp.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/zookeeper/LeaderElectorImp.java b/storm-core/src/jvm/org/apache/storm/zookeeper/LeaderElectorImp.java
index 1c21202..7923b7e 100644
--- a/storm-core/src/jvm/org/apache/storm/zookeeper/LeaderElectorImp.java
+++ b/storm-core/src/jvm/org/apache/storm/zookeeper/LeaderElectorImp.java
@@ -36,13 +36,13 @@ import java.util.concurrent.atomic.AtomicReference;
public class LeaderElectorImp implements ILeaderElector {
private static Logger LOG = LoggerFactory.getLogger(LeaderElectorImp.class);
- final private Map conf;
- final private List<String> servers;
- final private CuratorFramework zk;
- final private String leaderlockPath;
- final private String id;
- final private AtomicReference<LeaderLatch> leaderLatch;
- final private AtomicReference<LeaderLatchListener> leaderLatchListener;
+ private final Map conf;
+ private final List<String> servers;
+ private final CuratorFramework zk;
+ private final String leaderlockPath;
+ private final String id;
+ private final AtomicReference<LeaderLatch> leaderLatch;
+ private final AtomicReference<LeaderLatchListener> leaderLatchListener;
public LeaderElectorImp(Map conf, List<String> servers, CuratorFramework zk, String leaderlockPath, String id, AtomicReference<LeaderLatch> leaderLatch,
AtomicReference<LeaderLatchListener> leaderLatchListener) {
http://git-wip-us.apache.org/repos/asf/storm/blob/12631e05/storm-core/src/jvm/org/apache/storm/zookeeper/Zookeeper.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/zookeeper/Zookeeper.java b/storm-core/src/jvm/org/apache/storm/zookeeper/Zookeeper.java
index 503bd86..f1c7f32 100644
--- a/storm-core/src/jvm/org/apache/storm/zookeeper/Zookeeper.java
+++ b/storm-core/src/jvm/org/apache/storm/zookeeper/Zookeeper.java
@@ -166,7 +166,7 @@ public class Zookeeper {
} catch (Exception e) {
if (exceptionCause(KeeperException.NodeExistsException.class, e)) {
// do nothing
- LOG.info("exception", e);
+ LOG.info("delete {} failed.", path, e);
} else {
throw Utils.wrapInRuntime(e);
}