Repository: reef Updated Branches: refs/heads/master 7ec6de9c2 -> f7c37d57b
[REEF-1108] Enable IllegalCatch checkstyle check This patch: * Adds the IllegalCatch check to checkstyle.xml and checkstyle-strict.xml * Suppresses the check for files with the word "Test" in the filename * Fixes the violations of the check in the REEF Java codebase JIRA: [REEF-1108] (https://issues.apache.org/jira/browse/REEF-1108) Pull Request: This closes #776 Project: http://git-wip-us.apache.org/repos/asf/reef/repo Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/f7c37d57 Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/f7c37d57 Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/f7c37d57 Branch: refs/heads/master Commit: f7c37d57bcb6a441028509bd72566a3c84003a37 Parents: 7ec6de9 Author: [email protected] <[email protected]> Authored: Mon Jan 18 14:40:52 2016 +0100 Committer: Dongjoon Hyun <[email protected]> Committed: Tue Jan 19 15:13:14 2016 -0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/reef/client/FailedRuntime.java | 3 ++- .../main/java/org/apache/reef/runtime/common/REEFLauncher.java | 1 + .../apache/reef/runtime/common/evaluator/EvaluatorRuntime.java | 2 ++ .../reef/runtime/common/evaluator/context/ContextRuntime.java | 1 + .../runtime/common/evaluator/task/TaskLifeCycleHandlers.java | 2 ++ .../apache/reef/runtime/common/evaluator/task/TaskRuntime.java | 4 ++++ .../org/apache/reef/runtime/common/launch/REEFErrorHandler.java | 2 ++ .../org/apache/reef/util/ExceptionHandlingEventHandler.java | 1 + lang/java/reef-common/src/main/resources/checkstyle-strict.xml | 5 +++++ .../java/reef-common/src/main/resources/checkstyle-suppress.xml | 1 + lang/java/reef-common/src/main/resources/checkstyle.xml | 5 +++++ .../apache/reef/io/network/impl/NameServiceCloseHandler.java | 2 +- .../main/java/org/apache/reef/io/watcher/FileEventStream.java | 5 +++-- .../apache/reef/io/watcher/util/RunnableExecutingHandler.java | 2 +- .../java/org/apache/reef/runtime/local/client/DriverFiles.java | 4 ++-- .../reef/runtime/yarn/client/YarnJobSubmissionHandler.java | 2 +- .../reef/runtime/yarn/driver/YARNResourceLaunchHandler.java | 3 ++- .../main/java/org/apache/reef/wake/impl/SingleThreadStage.java | 2 +- .../wake/src/main/java/org/apache/reef/wake/impl/SyncStage.java | 1 + .../main/java/org/apache/reef/wake/impl/ThreadPoolStage.java | 1 + 20 files changed, 39 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/reef/blob/f7c37d57/lang/java/reef-common/src/main/java/org/apache/reef/client/FailedRuntime.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/client/FailedRuntime.java b/lang/java/reef-common/src/main/java/org/apache/reef/client/FailedRuntime.java index 4f8de7a..7bc6867 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/client/FailedRuntime.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/client/FailedRuntime.java @@ -21,6 +21,7 @@ package org.apache.reef.client; import org.apache.reef.common.AbstractFailure; import org.apache.reef.proto.ReefServiceProtos.RuntimeErrorProto; import org.apache.reef.util.Optional; +import org.apache.reef.wake.remote.exception.RemoteRuntimeException; import org.apache.reef.wake.remote.impl.ObjectSerializableCodec; import java.util.logging.Level; @@ -63,7 +64,7 @@ public final class FailedRuntime extends AbstractFailure { if (data != null) { try { return CODEC.decode(data); - } catch (final Throwable ex) { + } catch (final RemoteRuntimeException ex) { LOG.log(Level.FINE, "Could not decode exception {0}: {1}", new Object[]{error, ex}); } } http://git-wip-us.apache.org/repos/asf/reef/blob/f7c37d57/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/REEFLauncher.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/REEFLauncher.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/REEFLauncher.java index 55452a4..9356f55 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/REEFLauncher.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/REEFLauncher.java @@ -149,6 +149,7 @@ public final class REEFLauncher { * * @param args command-line args */ + @SuppressWarnings("checkstyle:illegalcatch") public static void main(final String[] args) { LOG.log(Level.INFO, "Entering REEFLauncher.main()."); LOG.log(Level.FINE, "REEFLauncher started with user name [{0}]", System.getProperty("user.name")); http://git-wip-us.apache.org/repos/asf/reef/blob/f7c37d57/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/EvaluatorRuntime.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/EvaluatorRuntime.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/EvaluatorRuntime.java index b931186..0584f58 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/EvaluatorRuntime.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/EvaluatorRuntime.java @@ -81,6 +81,7 @@ final class EvaluatorRuntime implements EventHandler<EvaluatorControlProto> { clock.scheduleAlarm(heartbeatPeriod, heartbeatAlarmHandler); } + @SuppressWarnings("checkstyle:illegalcatch") private void onEvaluatorControlMessage(final EvaluatorControlProto message) { synchronized (this.heartBeatManager) { @@ -166,6 +167,7 @@ final class EvaluatorRuntime implements EventHandler<EvaluatorControlProto> { final class RuntimeStartHandler implements EventHandler<RuntimeStart> { @Override + @SuppressWarnings("checkstyle:illegalcatch") public void onNext(final RuntimeStart runtimeStart) { synchronized (EvaluatorRuntime.this.heartBeatManager) { try { http://git-wip-us.apache.org/repos/asf/reef/blob/f7c37d57/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/context/ContextRuntime.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/context/ContextRuntime.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/context/ContextRuntime.java index 77a0b29..44c3881 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/context/ContextRuntime.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/context/ContextRuntime.java @@ -231,6 +231,7 @@ public final class ContextRuntime { * @throws IllegalStateException If this method is called when * there is either a task or child context already present. */ + @SuppressWarnings("checkstyle:illegalcatch") void startTask(final Configuration taskConfig) throws TaskClientCodeException { synchronized (this.contextLifeCycle) { http://git-wip-us.apache.org/repos/asf/reef/blob/f7c37d57/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskLifeCycleHandlers.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskLifeCycleHandlers.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskLifeCycleHandlers.java index 76375b0..1a389df 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskLifeCycleHandlers.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskLifeCycleHandlers.java @@ -61,6 +61,7 @@ final class TaskLifeCycleHandlers { /** * Sends the TaskStart event to the handlers for it. */ + @SuppressWarnings("checkstyle:illegalcatch") public void beforeTaskStart() throws TaskStartHandlerFailure { LOG.log(Level.FINEST, "Sending TaskStart event to the registered event handlers."); for (final EventHandler<TaskStart> startHandler : this.taskStartHandlers) { @@ -76,6 +77,7 @@ final class TaskLifeCycleHandlers { /** * Sends the TaskStop event to the handlers for it. */ + @SuppressWarnings("checkstyle:illegalcatch") public void afterTaskExit() throws TaskStopHandlerFailure { LOG.log(Level.FINEST, "Sending TaskStop event to the registered event handlers."); for (final EventHandler<TaskStop> stopHandler : this.taskStopHandlers) { http://git-wip-us.apache.org/repos/asf/reef/blob/f7c37d57/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskRuntime.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskRuntime.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskRuntime.java index 346e271..a5bda0a 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskRuntime.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskRuntime.java @@ -265,6 +265,7 @@ public final class TaskRuntime implements Runnable { * @throws TaskCallFailure if any Throwable was caught from the Task.call() method. * That throwable would be the cause of the TaskCallFailure. */ + @SuppressWarnings("checkstyle:illegalcatch") private byte[] runTask() throws TaskCallFailure { try { final byte[] result; @@ -285,6 +286,7 @@ public final class TaskRuntime implements Runnable { /** * Calls the configured Task close handler and catches exceptions it may throw. */ + @SuppressWarnings("checkstyle:illegalcatch") private void closeTask(final byte[] message) throws TaskCloseHandlerFailure { LOG.log(Level.FINEST, "Invoking close handler."); try { @@ -297,6 +299,7 @@ public final class TaskRuntime implements Runnable { /** * Calls the configured Task message handler and catches exceptions it may throw. */ + @SuppressWarnings("checkstyle:illegalcatch") private void deliverMessageToTask(final byte[] message) throws TaskMessageHandlerFailure { try { this.fMessageHandler.get().onNext(new DriverMessageImpl(message)); @@ -308,6 +311,7 @@ public final class TaskRuntime implements Runnable { /** * Calls the configured Task suspend handler and catches exceptions it may throw. */ + @SuppressWarnings("checkstyle:illegalcatch") private void suspendTask(final byte[] message) throws TaskSuspendHandlerFailure { try { this.fSuspendHandler.get().onNext(new SuspendEventImpl(message)); http://git-wip-us.apache.org/repos/asf/reef/blob/f7c37d57/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/launch/REEFErrorHandler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/launch/REEFErrorHandler.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/launch/REEFErrorHandler.java index d8daa16..be71ff5 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/launch/REEFErrorHandler.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/launch/REEFErrorHandler.java @@ -58,6 +58,7 @@ public final class REEFErrorHandler implements EventHandler<Throwable>, AutoClos } @Override + @SuppressWarnings("checkstyle:illegalcatch") public void onNext(final Throwable e) { LOG.log(Level.SEVERE, "Uncaught exception.", e); if (!this.errorHandlerRID.equals(ErrorHandlerRID.NONE)) { @@ -79,6 +80,7 @@ public final class REEFErrorHandler implements EventHandler<Throwable>, AutoClos } } + @SuppressWarnings("checkstyle:illegalcatch") public void close() { try { this.remoteManager.get().close(); http://git-wip-us.apache.org/repos/asf/reef/blob/f7c37d57/lang/java/reef-common/src/main/java/org/apache/reef/util/ExceptionHandlingEventHandler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/util/ExceptionHandlingEventHandler.java b/lang/java/reef-common/src/main/java/org/apache/reef/util/ExceptionHandlingEventHandler.java index b462270..235f947 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/util/ExceptionHandlingEventHandler.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/util/ExceptionHandlingEventHandler.java @@ -40,6 +40,7 @@ public final class ExceptionHandlingEventHandler<T> implements EventHandler<T> { } @Override + @SuppressWarnings("checkstyle:illegalcatch") public void onNext(final T t) { try { this.wrapped.onNext(t); http://git-wip-us.apache.org/repos/asf/reef/blob/f7c37d57/lang/java/reef-common/src/main/resources/checkstyle-strict.xml ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/resources/checkstyle-strict.xml b/lang/java/reef-common/src/main/resources/checkstyle-strict.xml index 3412d94..f55fe27 100644 --- a/lang/java/reef-common/src/main/resources/checkstyle-strict.xml +++ b/lang/java/reef-common/src/main/resources/checkstyle-strict.xml @@ -233,6 +233,11 @@ <property name="illegalClassNames" value="Throwable, Error, RuntimeException, NullPointerException"/> </module> + <!-- IllegalCatch is suppressed for files with the word "Test" in the filename --> + <module name="IllegalCatch"> + <property name="illegalClassNames" value="Throwable, RuntimeException, Error" /> + </module> + </module> </module> http://git-wip-us.apache.org/repos/asf/reef/blob/f7c37d57/lang/java/reef-common/src/main/resources/checkstyle-suppress.xml ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/resources/checkstyle-suppress.xml b/lang/java/reef-common/src/main/resources/checkstyle-suppress.xml index 6a9da64..beba01f 100644 --- a/lang/java/reef-common/src/main/resources/checkstyle-suppress.xml +++ b/lang/java/reef-common/src/main/resources/checkstyle-suppress.xml @@ -22,4 +22,5 @@ <suppressions> <suppress checks=".*" files=".*\\target\\generated-sources\\.*" /> <suppress checks="IllegalThrows" files=".*Test.*" /> + <suppress checks="IllegalCatch" files=".*Test.*" /> </suppressions> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/reef/blob/f7c37d57/lang/java/reef-common/src/main/resources/checkstyle.xml ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/resources/checkstyle.xml b/lang/java/reef-common/src/main/resources/checkstyle.xml index a21196c..14c6794 100644 --- a/lang/java/reef-common/src/main/resources/checkstyle.xml +++ b/lang/java/reef-common/src/main/resources/checkstyle.xml @@ -235,6 +235,11 @@ <property name="illegalClassNames" value="Throwable, Error, RuntimeException, NullPointerException"/> </module> + <!-- IllegalCatch is suppressed for files with the word "Test" in the filename --> + <module name="IllegalCatch"> + <property name="illegalClassNames" value="Throwable, RuntimeException, Error" /> + </module> + </module> </module> http://git-wip-us.apache.org/repos/asf/reef/blob/f7c37d57/lang/java/reef-io/src/main/java/org/apache/reef/io/network/impl/NameServiceCloseHandler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/impl/NameServiceCloseHandler.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/impl/NameServiceCloseHandler.java index 6d90c8d..a57635b 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/impl/NameServiceCloseHandler.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/impl/NameServiceCloseHandler.java @@ -42,7 +42,7 @@ public final class NameServiceCloseHandler implements EventHandler<ContextStop> try { LOG.log(Level.FINEST, "Closing {0}", this.toClose); this.toClose.close(); - } catch (final Throwable ex) { + } catch (final Exception ex) { LOG.log(Level.SEVERE, "Exception while closing " + this.toClose, ex); } } http://git-wip-us.apache.org/repos/asf/reef/blob/f7c37d57/lang/java/reef-io/src/main/java/org/apache/reef/io/watcher/FileEventStream.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/watcher/FileEventStream.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/watcher/FileEventStream.java index a05f427..287ecb7 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/watcher/FileEventStream.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/watcher/FileEventStream.java @@ -29,6 +29,7 @@ import org.apache.reef.wake.impl.ThreadPoolStage; import javax.inject.Inject; import java.io.File; import java.io.FileOutputStream; +import java.io.IOException; import java.io.OutputStreamWriter; import java.io.PrintWriter; import java.nio.charset.Charset; @@ -58,12 +59,12 @@ public final class FileEventStream implements EventStream { final OutputStreamWriter writer = new OutputStreamWriter( new FileOutputStream(createFileWithPath(path)), Charset.forName("UTF-8")); this.printWriter = new PrintWriter(writer); - } catch (final Exception e) { + } catch (final IOException e) { throw new RuntimeException(e); } } - private File createFileWithPath(final String path) throws Exception { + private File createFileWithPath(final String path) throws IOException { final File file = new File(path); final File parent = file.getParentFile(); if (parent != null && !parent.exists() && !parent.mkdirs()) { http://git-wip-us.apache.org/repos/asf/reef/blob/f7c37d57/lang/java/reef-io/src/main/java/org/apache/reef/io/watcher/util/RunnableExecutingHandler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/watcher/util/RunnableExecutingHandler.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/watcher/util/RunnableExecutingHandler.java index ddb8acd..c2fce63 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/watcher/util/RunnableExecutingHandler.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/watcher/util/RunnableExecutingHandler.java @@ -36,7 +36,7 @@ public final class RunnableExecutingHandler implements EventHandler<Runnable> { public void onNext(final Runnable runnable) { try { runnable.run(); - } catch(final Throwable exception) { + } catch(final Exception exception) { LOG.log(Level.INFO, "An exception occurred while writing event with Watcher. {0}", exception.getMessage()); } } http://git-wip-us.apache.org/repos/asf/reef/blob/f7c37d57/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/client/DriverFiles.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/client/DriverFiles.java b/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/client/DriverFiles.java index cf7b946..02a1273 100644 --- a/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/client/DriverFiles.java +++ b/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/client/DriverFiles.java @@ -148,8 +148,8 @@ final class DriverFiles { this.localLibs.createSymbolicLinkTo(localFolder); this.globalLibs.createSymbolicLinkTo(globalFolder); this.globalFiles.createSymbolicLinkTo(globalFolder); - } catch (final Throwable t) { - LOG.log(Level.FINE, "Can't symlink the files, copying them instead.", t); + } catch (final IOException e) { + LOG.log(Level.FINE, "Can't symlink the files, copying them instead.", e); this.localFiles.copyTo(localFolder); this.localLibs.copyTo(localFolder); this.globalLibs.copyTo(globalFolder); http://git-wip-us.apache.org/repos/asf/reef/blob/f7c37d57/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/client/YarnJobSubmissionHandler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/client/YarnJobSubmissionHandler.java b/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/client/YarnJobSubmissionHandler.java index 3436424..f006e83 100644 --- a/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/client/YarnJobSubmissionHandler.java +++ b/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/client/YarnJobSubmissionHandler.java @@ -172,7 +172,7 @@ final class YarnJobSubmissionHandler implements JobSubmissionHandler { private String getQueue(final Configuration driverConfiguration) { try { return Tang.Factory.getTang().newInjector(driverConfiguration).getNamedInstance(JobQueue.class); - } catch (final Throwable t) { + } catch (final InjectionException e) { return this.defaultQueueName; } } http://git-wip-us.apache.org/repos/asf/reef/blob/f7c37d57/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/YARNResourceLaunchHandler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/YARNResourceLaunchHandler.java b/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/YARNResourceLaunchHandler.java index 34dea40..54260a1 100644 --- a/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/YARNResourceLaunchHandler.java +++ b/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/YARNResourceLaunchHandler.java @@ -35,6 +35,7 @@ import org.apache.reef.tang.InjectionFuture; import org.apache.reef.tang.annotations.Parameter; import javax.inject.Inject; +import java.io.IOException; import java.util.List; import java.util.Map; import java.util.logging.Level; @@ -96,7 +97,7 @@ public final class YARNResourceLaunchHandler implements ResourceLaunchHandler { LOG.log(Level.FINEST, "TIME: End ResourceLaunch {0}", containerId); - } catch (final Throwable e) { + } catch (final IOException e) { LOG.log(Level.WARNING, "Error handling resource launch message: " + resourceLaunchEvent, e); throw new RuntimeException(e); } http://git-wip-us.apache.org/repos/asf/reef/blob/f7c37d57/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/SingleThreadStage.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/SingleThreadStage.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/SingleThreadStage.java index 033a1cb..81c3c38 100644 --- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/SingleThreadStage.java +++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/SingleThreadStage.java @@ -133,7 +133,7 @@ public final class SingleThreadStage<T> extends AbstractEStage<T> { LOG.log(Level.FINEST, name + " Closing Producer due to interruption"); break; } - } catch (final Throwable t) { + } catch (final Exception t) { LOG.log(Level.SEVERE, name + " Exception from event handler", t); throw t; } http://git-wip-us.apache.org/repos/asf/reef/blob/f7c37d57/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/SyncStage.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/SyncStage.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/SyncStage.java index 3c5496b..0ef88fe 100644 --- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/SyncStage.java +++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/SyncStage.java @@ -86,6 +86,7 @@ public final class SyncStage<T> extends AbstractEStage<T> { * @param value the event */ @Override + @SuppressWarnings("checkstyle:illegalcatch") public void onNext(final T value) { beforeOnNext(); try { http://git-wip-us.apache.org/repos/asf/reef/blob/f7c37d57/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/ThreadPoolStage.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/ThreadPoolStage.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/ThreadPoolStage.java index 4687896..3d46e37 100644 --- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/ThreadPoolStage.java +++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/ThreadPoolStage.java @@ -171,6 +171,7 @@ public final class ThreadPoolStage<T> extends AbstractEStage<T> { * @param value the event */ @Override + @SuppressWarnings("checkstyle:illegalcatch") public void onNext(final T value) { beforeOnNext(); executor.submit(new Runnable() {
