Repository: incubator-reef Updated Branches: refs/heads/master eb5bc9e31 -> ec9b497d4
[REEF-461] Switch to Checkstyle 6.6 This configures the `maven-checkstyle-plugin` to use a custom version of checkstyle instead of default one. JIRA: [REEF-461](https://issues.apache.org/jira/browse/REEF-461) Pull Request: This closes #281 Project: http://git-wip-us.apache.org/repos/asf/incubator-reef/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-reef/commit/ec9b497d Tree: http://git-wip-us.apache.org/repos/asf/incubator-reef/tree/ec9b497d Diff: http://git-wip-us.apache.org/repos/asf/incubator-reef/diff/ec9b497d Branch: refs/heads/master Commit: ec9b497d4eadd8ba1e73c077c9958abd2d30a2d4 Parents: eb5bc9e Author: Mariia Mykhailova <[email protected]> Authored: Tue Jul 7 10:23:52 2015 -0700 Committer: Markus Weimer <[email protected]> Committed: Tue Jul 7 12:33:02 2015 -0700 ---------------------------------------------------------------------- .../org/apache/reef/examples/suspend/SuspendDriver.java | 2 +- .../io/network/group/impl/driver/TaskNodeStatusImpl.java | 10 +++++----- pom.xml | 7 +++++++ 3 files changed, 13 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ec9b497d/lang/java/reef-examples/src/main/java/org/apache/reef/examples/suspend/SuspendDriver.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/suspend/SuspendDriver.java b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/suspend/SuspendDriver.java index a6ab268..c10bd7d 100644 --- a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/suspend/SuspendDriver.java +++ b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/suspend/SuspendDriver.java @@ -289,7 +289,7 @@ public class SuspendDriver { case "resume": { final SuspendedTask suspendedTask; - synchronized (suspendedTasks) { + synchronized (suspendedTasks) { suspendedTask = suspendedTasks.remove(taskId); } if (suspendedTask != null) { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ec9b497d/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/TaskNodeStatusImpl.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/TaskNodeStatusImpl.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/TaskNodeStatusImpl.java index de3dbf7..6503a92 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/TaskNodeStatusImpl.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/TaskNodeStatusImpl.java @@ -153,12 +153,12 @@ public class TaskNodeStatusImpl implements TaskNodeStatus { final String sourceId = gcm.getDestid(); switch (msgType) { case TopologySetup: - synchronized (topoUpdateStageLock) { - if (!updatingTopo.compareAndSet(true, false)) { - LOG.fine(getQualifiedName() + "Was expecting updateTopo to be true but it was false"); + synchronized (topoUpdateStageLock) { + if (!updatingTopo.compareAndSet(true, false)) { + LOG.fine(getQualifiedName() + "Was expecting updateTopo to be true but it was false"); + } + topoUpdateStageLock.notifyAll(); } - topoUpdateStageLock.notifyAll(); - } break; case ParentAdded: case ChildAdded: http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ec9b497d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 0ad4bd9..1ca5725 100644 --- a/pom.xml +++ b/pom.xml @@ -278,6 +278,13 @@ under the License. <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> <version>${maven-checkstyle-plugin.version}</version> + <dependencies> + <dependency> + <groupId>com.puppycrawl.tools</groupId> + <artifactId>checkstyle</artifactId> + <version>${checkstyle.version}</version> + </dependency> + </dependencies> <configuration> <configLocation>lang/java/reef-common/src/main/resources/checkstyle.xml</configLocation> <failOnViolation>true</failOnViolation>
