Repository: giraph Updated Branches: refs/heads/trunk 6140c873a -> 4968416aa
GIRAPH-866: Fix checkstyle error from GIRAPH-865 (majakabiljo) Project: http://git-wip-us.apache.org/repos/asf/giraph/repo Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/4968416a Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/4968416a Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/4968416a Branch: refs/heads/trunk Commit: 4968416aa0b1d1b32053c36e8a0bd649f7180b49 Parents: 6140c87 Author: Maja Kabiljo <[email protected]> Authored: Wed Feb 26 13:34:07 2014 -0800 Committer: Maja Kabiljo <[email protected]> Committed: Wed Feb 26 13:34:07 2014 -0800 ---------------------------------------------------------------------- CHANGELOG | 2 ++ .../src/main/java/org/apache/giraph/job/JobProgressTracker.java | 4 ++++ 2 files changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/giraph/blob/4968416a/CHANGELOG ---------------------------------------------------------------------- diff --git a/CHANGELOG b/CHANGELOG index 74ab305..4d9f510 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ Giraph Change Log Release 1.1.0 - unreleased + GIRAPH-866: Fix checkstyle error from GIRAPH-865 (majakabiljo) + GIRAPH-865: Job client shouldn't crash when JobProgressTracker gets exception (majakabiljo) http://git-wip-us.apache.org/repos/asf/giraph/blob/4968416a/giraph-core/src/main/java/org/apache/giraph/job/JobProgressTracker.java ---------------------------------------------------------------------- diff --git a/giraph-core/src/main/java/org/apache/giraph/job/JobProgressTracker.java b/giraph-core/src/main/java/org/apache/giraph/job/JobProgressTracker.java index b8d3769..6971174 100644 --- a/giraph-core/src/main/java/org/apache/giraph/job/JobProgressTracker.java +++ b/giraph-core/src/main/java/org/apache/giraph/job/JobProgressTracker.java @@ -110,7 +110,9 @@ public class JobProgressTracker implements Watcher { } Thread.sleep(UPDATE_MILLISECONDS); } + // CHECKSTYLE: stop IllegalCatchCheck } catch (Exception e) { + // CHECKSTYLE: resume IllegalCatchCheck if (LOG.isInfoEnabled()) { LOG.info("run: Exception occurred", e); } @@ -125,7 +127,9 @@ public class JobProgressTracker implements Watcher { CreateMode.PERSISTENT, true); zk.close(); + // CHECKSTYLE: stop IllegalCatchCheck } catch (Exception e) { + // CHECKSTYLE: resume IllegalCatchCheck if (LOG.isInfoEnabled()) { LOG.info("run: Exception occurred", e); }
