Repository: reef Updated Branches: refs/heads/master 67894d51b -> a2222690e
[REEF-802] Fix medium-priority warnings reported by Findbugs, part 1 This change fixes or configures to be ignored meduim-priority bugs in all Java code except: * reef-io * reef-wake * reef-common * toString() returning null in reef-runtime-hdinsight These will be fixed in part 2. JIRA: [REEF-802](https://issues.apache.org/jira/browse/REEF-802) Pull request: This closes #756 Project: http://git-wip-us.apache.org/repos/asf/reef/repo Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/a2222690 Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/a2222690 Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/a2222690 Branch: refs/heads/master Commit: a2222690eee9fe286dd4e77152dab814ce20dfde Parents: 67894d5 Author: Mariia Mykhailova <[email protected]> Authored: Wed Dec 30 10:05:47 2015 -0800 Committer: Dongjoon Hyun <[email protected]> Committed: Wed Jan 6 13:54:41 2016 -0800 ---------------------------------------------------------------------- .../reef/javabridge/generic/JobClient.java | 9 ++- .../src/main/resources/findbugs-exclude.xml | 62 ++++++++++++++++++++ .../apache/reef/examples/helloCLR/HelloCLR.java | 9 ++- .../reef/examples/hellohttp/HelloREEFHttp.java | 4 +- .../hellohttp/HttpServerShellCmdHandler.java | 3 - .../examples/hellohttp/HttpShellJobDriver.java | 18 +++--- .../scheduler/driver/SchedulerDriver.java | 10 ++-- .../reef/examples/suspend/SuspendClient.java | 2 +- .../reef/examples/suspend/SuspendTestTask.java | 10 ++-- .../reef/runtime/hdinsight/cli/HDICLI.java | 4 +- .../reef/runtime/hdinsight/cli/LogFetcher.java | 6 +- .../hdinsight/client/yarnrest/StringEntry.java | 4 +- .../reef/runtime/local/client/DriverFiles.java | 12 +++- .../local/client/LocalJobSubmissionHandler.java | 4 +- .../runtime/local/driver/ContainerManager.java | 4 +- .../runtime/local/driver/ProcessContainer.java | 13 +++- .../runtime/local/process/RunnableProcess.java | 8 ++- .../mesos/client/MesosJobSubmissionHandler.java | 22 +++++-- .../yarn/driver/EvaluatorSetupHelper.java | 4 +- .../driver/restart/DFSEvaluatorPreserver.java | 8 ++- .../java/org/apache/reef/tang/examples/A.java | 1 - .../java/org/apache/reef/tang/util/Tint.java | 3 +- .../tang/implementation/ListInjectionPlan.java | 4 +- .../tang/implementation/SetInjectionPlan.java | 8 +-- .../tang/implementation/java/InjectorImpl.java | 10 ++-- .../types/ConstructorArgImpl.java | 5 +- .../org/apache/reef/tang/util/walk/Walk.java | 2 +- .../tests/messaging/driver/DriverMessaging.java | 4 +- .../tests/statepassing/StatePassingDriver.java | 3 - .../reef/webserver/ParsedHttpRequest.java | 2 +- .../reef/webserver/ReefEventStateManager.java | 2 +- 31 files changed, 186 insertions(+), 74 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/reef/blob/a2222690/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/generic/JobClient.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/generic/JobClient.java b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/generic/JobClient.java index d25f19c..4a2858a 100644 --- a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/generic/JobClient.java +++ b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/generic/JobClient.java @@ -165,9 +165,12 @@ public class JobClient { public void addCLRFiles(final File folder) throws BindException { try (final LoggingScope ls = this.loggingScopeFactory.getNewLoggingScope("JobClient::addCLRFiles")) { ConfigurationModule result = this.driverConfigModule; - for (final File f : folder.listFiles()) { - if (f.canRead() && f.exists() && f.isFile()) { - result = result.set(DriverConfiguration.GLOBAL_FILES, f.getAbsolutePath()); + final File[] files = folder.listFiles(); + if (files != null) { + for (final File f : files) { + if (f.canRead() && f.exists() && f.isFile()) { + result = result.set(DriverConfiguration.GLOBAL_FILES, f.getAbsolutePath()); + } } } http://git-wip-us.apache.org/repos/asf/reef/blob/a2222690/lang/java/reef-common/src/main/resources/findbugs-exclude.xml ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/resources/findbugs-exclude.xml b/lang/java/reef-common/src/main/resources/findbugs-exclude.xml index 96395f3..f7888d9 100644 --- a/lang/java/reef-common/src/main/resources/findbugs-exclude.xml +++ b/lang/java/reef-common/src/main/resources/findbugs-exclude.xml @@ -18,12 +18,15 @@ --> <FindBugsFilter> + <!-- Autogenerated code --> <Match> <Class name="~.*\.proto\..*" /> </Match> <Match> <Class name="~.*\.avro\..*" /> </Match> + + <!-- High-priority bugs --> <Match> <!-- Justified call of GC; explained in code --> <Class name="org.apache.reef.runtime.common.evaluator.context.ContextManager" /> @@ -38,4 +41,63 @@ <Class name="org.apache.reef.javabridge.NativeInterop" /> <Bug code="MS" /> </Match> + + <!-- Medium-priority bugs --> + <Match> + <!-- Internal representation necessary for serialization --> + <Class name="org.apache.reef.webserver.ParsedHttpRequest" /> + <Bug code="EI" /> + </Match> + <Match> + <!-- Internal handler classes shouldn't be static --> + <Class name="~org\.apache\.reef\..*" /> + <Bug code="SIC" /> + </Match> + <Match> + <!-- Not worried about exposing internal representation at this point --> + <Class name="~org\.apache\.reef\..*" /> + <Bug code="EI, EI2" /> + </Match> + <Match> + <!-- Fields-placeholders for future use in bridge --> + <Class name="~org\.apache\.reef\.javabridge\..*" /> + <Bug code="UrF" /> + </Match> + <Match> + <!-- Synchronization and waiting warnings, somewhat unreliable --> + <Class name="org.apache.reef.javabridge.generic.JobClient" /> + <Bug code="IS,UW" /> + </Match> + <Match> + <!-- Waiting warnings, not applicable --> + <Class name="org.apache.reef.examples.suspend.SuspendClient" /> + <Bug code="UW,Wa" /> + </Match> + <Match> + <!-- Code uses custom TracingMonotonicTreeMap which doesn't implement entrySet --> + <!-- TODO: implement entrySet() ? --> + <Class name="org.apache.reef.tang.implementation.java.InjectorImpl" /> + <Bug code="WMI" /> + </Match> + <Match> + <!-- Code uses custom map which doesn't implement entrySet --> + <Class name="org.apache.reef.tang.util.MonotonicHashMap" /> + <Bug code="WMI" /> + </Match> + <Match> + <!-- TODO: consider whether we need to wrap this in doPrivileged block --> + <Class name="org.apache.reef.tang.implementation.java.ClassHierarchyImpl" /> + <Bug pattern="DP_CREATE_CLASSLOADER_INSIDE_DO_PRIVILEGED" /> + </Match> + <Match> + <!-- Comparison used to verify result of cast --> + <Class name="org.apache.reef.tang.util.ReflectionUtilities" /> + <Bug pattern="SA_LOCAL_SELF_COMPARISON" /> + </Match> + <Match> + <!-- TODO: double-check --> + <Class name="~org\.apache\.reef\.tang\.util\.AbstractMonotonicMultiMap.*" /> + <Bug code="NP" /> + </Match> + </FindBugsFilter> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/reef/blob/a2222690/lang/java/reef-examples-clr/src/main/java/org/apache/reef/examples/helloCLR/HelloCLR.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-examples-clr/src/main/java/org/apache/reef/examples/helloCLR/HelloCLR.java b/lang/java/reef-examples-clr/src/main/java/org/apache/reef/examples/helloCLR/HelloCLR.java index 06c216c..e31af55 100644 --- a/lang/java/reef-examples-clr/src/main/java/org/apache/reef/examples/helloCLR/HelloCLR.java +++ b/lang/java/reef-examples-clr/src/main/java/org/apache/reef/examples/helloCLR/HelloCLR.java @@ -55,9 +55,12 @@ public final class HelloCLR { final OptionalParameter<String> param, final File folder) { ConfigurationModule result = conf; - for (final File f : folder.listFiles()) { - if (f.canRead() && f.exists() && f.isFile()) { - result = result.set(param, f.getAbsolutePath()); + final File[] files = folder.listFiles(); + if (files != null) { + for (final File f : files) { + if (f.canRead() && f.exists() && f.isFile()) { + result = result.set(param, f.getAbsolutePath()); + } } } return result; http://git-wip-us.apache.org/repos/asf/reef/blob/a2222690/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hellohttp/HelloREEFHttp.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hellohttp/HelloREEFHttp.java b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hellohttp/HelloREEFHttp.java index b285fd5..7df360f 100644 --- a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hellohttp/HelloREEFHttp.java +++ b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hellohttp/HelloREEFHttp.java @@ -102,7 +102,7 @@ public final class HelloREEFHttp { } /** - * main program. + * Main program. * * @param args * @throws InjectionException @@ -111,7 +111,7 @@ public final class HelloREEFHttp { final Configuration runtimeConfiguration = LocalRuntimeConfiguration.CONF .set(LocalRuntimeConfiguration.MAX_NUMBER_OF_EVALUATORS, MAX_NUMBER_OF_EVALUATORS) .build(); - final LauncherStatus status = runHelloReef(runtimeConfiguration, HelloREEFHttp.JOB_TIMEOUT); + runHelloReef(runtimeConfiguration, HelloREEFHttp.JOB_TIMEOUT); } /** http://git-wip-us.apache.org/repos/asf/reef/blob/a2222690/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hellohttp/HttpServerShellCmdHandler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hellohttp/HttpServerShellCmdHandler.java b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hellohttp/HttpServerShellCmdHandler.java index 35fa866..a47c125 100644 --- a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hellohttp/HttpServerShellCmdHandler.java +++ b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hellohttp/HttpServerShellCmdHandler.java @@ -30,8 +30,6 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.nio.charset.StandardCharsets; -import java.util.List; -import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; @@ -103,7 +101,6 @@ class HttpServerShellCmdHandler implements HttpHandler { throws IOException, ServletException { LOG.log(Level.INFO, "HttpServeShellCmdHandler in webserver onHttpRequest is called: {0}", parsedHttpRequest.getRequestUri()); - final Map<String, List<String>> queries = parsedHttpRequest.getQueryMap(); final String queryStr = parsedHttpRequest.getQueryString(); if (parsedHttpRequest.getTargetEntity().equalsIgnoreCase("Evaluators")) { http://git-wip-us.apache.org/repos/asf/reef/blob/a2222690/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hellohttp/HttpShellJobDriver.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hellohttp/HttpShellJobDriver.java b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hellohttp/HttpShellJobDriver.java index 89cfa8e..bf71f4d 100644 --- a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hellohttp/HttpShellJobDriver.java +++ b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hellohttp/HttpShellJobDriver.java @@ -126,7 +126,7 @@ public final class HttpShellJobDriver { * * @param command shell command to execute. */ - private void submit(final String command) { + private synchronized void submit(final String command) { LOG.log(Level.INFO, "Submit command {0} to {1} evaluators. state: {2}", new Object[]{command, this.contexts.size(), this.state}); assert this.state == State.READY; @@ -346,9 +346,11 @@ public final class HttpShellJobDriver { final class StartHandler implements EventHandler<StartTime> { @Override public void onNext(final StartTime startTime) { - LOG.log(Level.INFO, "{0} StartTime: {1}", new Object[]{state, startTime}); - assert state == State.INIT; - requestEvaluators(); + synchronized (HttpShellJobDriver.this) { + LOG.log(Level.INFO, "{0} StartTime: {1}", new Object[]{state, startTime}); + assert state == State.INIT; + requestEvaluators(); + } } } @@ -358,9 +360,11 @@ public final class HttpShellJobDriver { final class StopHandler implements EventHandler<StopTime> { @Override public void onNext(final StopTime time) { - LOG.log(Level.INFO, "{0} StopTime: {1}", new Object[]{state, time}); - for (final ActiveContext context : contexts.values()) { - context.close(); + synchronized (HttpShellJobDriver.this) { + LOG.log(Level.INFO, "{0} StopTime: {1}", new Object[]{state, time}); + for (final ActiveContext context : contexts.values()) { + context.close(); + } } } } http://git-wip-us.apache.org/repos/asf/reef/blob/a2222690/lang/java/reef-examples/src/main/java/org/apache/reef/examples/scheduler/driver/SchedulerDriver.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/scheduler/driver/SchedulerDriver.java b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/scheduler/driver/SchedulerDriver.java index 3b8bad7..f4a1127 100644 --- a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/scheduler/driver/SchedulerDriver.java +++ b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/scheduler/driver/SchedulerDriver.java @@ -94,11 +94,13 @@ public final class SchedulerDriver { public final class StartHandler implements EventHandler<StartTime> { @Override public void onNext(final StartTime startTime) { - LOG.log(Level.INFO, "Driver started at {0}", startTime); - assert state == State.INIT; - state = State.WAIT_EVALUATORS; + synchronized (SchedulerDriver.this) { + LOG.log(Level.INFO, "Driver started at {0}", startTime); + assert state == State.INIT; + state = State.WAIT_EVALUATORS; - requestEvaluator(1); // Allocate an initial evaluator to avoid idle state. + requestEvaluator(1); // Allocate an initial evaluator to avoid idle state. + } } } http://git-wip-us.apache.org/repos/asf/reef/blob/a2222690/lang/java/reef-examples/src/main/java/org/apache/reef/examples/suspend/SuspendClient.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/suspend/SuspendClient.java b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/suspend/SuspendClient.java index 9ffc622..0cf817a 100644 --- a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/suspend/SuspendClient.java +++ b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/suspend/SuspendClient.java @@ -167,7 +167,7 @@ public class SuspendClient { @Override public void onNext(final FailedRuntime error) { LOG.log(Level.SEVERE, "ERROR: " + error, error.getReason().orElse(null)); - synchronized (SuspendClient.class) { + synchronized (SuspendClient.this) { SuspendClient.this.notify(); } } http://git-wip-us.apache.org/repos/asf/reef/blob/a2222690/lang/java/reef-examples/src/main/java/org/apache/reef/examples/suspend/SuspendTestTask.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/suspend/SuspendTestTask.java b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/suspend/SuspendTestTask.java index db588ca..1222f01 100644 --- a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/suspend/SuspendTestTask.java +++ b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/suspend/SuspendTestTask.java @@ -173,10 +173,12 @@ public class SuspendTestTask implements Task, TaskMessageSource { @Override public void onNext(final SuspendEvent suspendEvent) { final byte[] message = suspendEvent.get().get(); - LOG.log(Level.INFO, "Suspend: {0} with: {1} bytes; counter: {2}", - new Object[]{this, message.length, SuspendTestTask.this.counter}); - SuspendTestTask.this.suspended = true; - SuspendTestTask.this.notify(); + synchronized (SuspendTestTask.this) { + LOG.log(Level.INFO, "Suspend: {0} with: {1} bytes; counter: {2}", + new Object[]{this, message.length, SuspendTestTask.this.counter}); + SuspendTestTask.this.suspended = true; + SuspendTestTask.this.notify(); + } } } http://git-wip-us.apache.org/repos/asf/reef/blob/a2222690/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/cli/HDICLI.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/cli/HDICLI.java b/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/cli/HDICLI.java index b4fdfe9..a14ace2 100644 --- a/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/cli/HDICLI.java +++ b/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/cli/HDICLI.java @@ -136,7 +136,9 @@ public final class HDICLI { private void logs(final String applicationId, final File folder) throws IOException { LOG.log(Level.FINE, "Fetching logs for application [{0}] and storing them in folder [{1}]", new Object[]{applicationId, folder.getAbsolutePath()}); - folder.mkdirs(); + if (!folder.exists() && !folder.mkdirs()) { + LOG.log(Level.WARNING, "Failed to create [{0}]", folder.getAbsolutePath()); + } this.logFetcher.fetch(applicationId, folder); } http://git-wip-us.apache.org/repos/asf/reef/blob/a2222690/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/cli/LogFetcher.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/cli/LogFetcher.java b/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/cli/LogFetcher.java index e8c277f..152873b 100644 --- a/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/cli/LogFetcher.java +++ b/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/cli/LogFetcher.java @@ -118,7 +118,9 @@ final class LogFetcher { private File downloadToTempFolder(final String applicationId) throws URISyntaxException, StorageException, IOException { final File outputFolder = Files.createTempDirectory("reeflogs-" + applicationId).toFile(); - outputFolder.mkdirs(); + if (!outputFolder.exists() && !outputFolder.mkdirs()) { + LOG.log(Level.WARNING, "Failed to create [{0}]", outputFolder.getAbsolutePath()); + } final CloudBlobDirectory logFolder = this.container.getDirectoryReference(LOG_FOLDER_PREFIX + applicationId + "/"); int fileCounter = 0; for (final ListBlobItem blobItem : logFolder.listBlobs()) { @@ -129,7 +131,7 @@ final class LogFetcher { } } } - LOG.log(Level.FINE, "Downloadeded logs to: {0}", outputFolder.getAbsolutePath()); + LOG.log(Level.FINE, "Downloaded logs to: {0}", outputFolder.getAbsolutePath()); return outputFolder; } http://git-wip-us.apache.org/repos/asf/reef/blob/a2222690/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/StringEntry.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/StringEntry.java b/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/StringEntry.java index d5487a6..80a5d85 100644 --- a/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/StringEntry.java +++ b/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/StringEntry.java @@ -86,8 +86,8 @@ public final class StringEntry { final StringEntry that = (StringEntry) o; - return (this.key == that.key || this.key != null && this.key.equals(that.key)) - && (this.value == that.value || this.value != null && this.value.equals(that.value)); + return (this.key == null && that.key == null || this.key != null && this.key.equals(that.key)) + && (this.value == null && that.value == null || this.value != null && this.value.equals(that.value)); } @Override http://git-wip-us.apache.org/repos/asf/reef/blob/a2222690/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 6e0e9d1..cf7b946 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 @@ -129,13 +129,19 @@ final class DriverFiles { * @throws IOException if one or more of the copies fail. */ public void copyTo(final File destinationFolder) throws IOException { - destinationFolder.mkdirs(); + if (!destinationFolder.exists() && !destinationFolder.mkdirs()) { + LOG.log(Level.WARNING, "Failed to create [{0}]", destinationFolder.getAbsolutePath()); + } final File reefFolder = new File(destinationFolder, fileNames.getREEFFolderName()); final File localFolder = new File(reefFolder, fileNames.getLocalFolderName()); final File globalFolder = new File(reefFolder, fileNames.getGlobalFolderName()); - localFolder.mkdirs(); - globalFolder.mkdirs(); + if (!localFolder.exists() && !localFolder.mkdirs()) { + LOG.log(Level.WARNING, "Failed to create [{0}]", localFolder.getAbsolutePath()); + } + if (!globalFolder.exists() && !globalFolder.mkdirs()) { + LOG.log(Level.WARNING, "Failed to create [{0}]", globalFolder.getAbsolutePath()); + } try { this.localFiles.createSymbolicLinkTo(localFolder); http://git-wip-us.apache.org/repos/asf/reef/blob/a2222690/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/client/LocalJobSubmissionHandler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/client/LocalJobSubmissionHandler.java b/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/client/LocalJobSubmissionHandler.java index 50631fd..f3531c7 100644 --- a/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/client/LocalJobSubmissionHandler.java +++ b/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/client/LocalJobSubmissionHandler.java @@ -91,7 +91,9 @@ final class LocalJobSubmissionHandler implements JobSubmissionHandler { "/" + t.getIdentifier() + "-" + System.currentTimeMillis() + "/"); final File driverFolder = new File(jobFolder, PreparedDriverFolderLauncher.DRIVER_FOLDER_NAME); - driverFolder.mkdirs(); + if (!driverFolder.exists() && !driverFolder.mkdirs()) { + LOG.log(Level.WARNING, "Failed to create [{0}]", driverFolder.getAbsolutePath()); + } final DriverFiles driverFiles = DriverFiles.fromJobSubmission(t, this.fileNames); driverFiles.copyTo(driverFolder); http://git-wip-us.apache.org/repos/asf/reef/blob/a2222690/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/driver/ContainerManager.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/driver/ContainerManager.java b/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/driver/ContainerManager.java index db59e4b..e0a8395 100644 --- a/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/driver/ContainerManager.java +++ b/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/driver/ContainerManager.java @@ -357,7 +357,9 @@ final class ContainerManager implements AutoCloseable { final String processID = nodeId + "-" + String.valueOf(System.currentTimeMillis()); final File processFolder = new File(this.rootFolder, processID); - processFolder.mkdirs(); + if (!processFolder.exists() && !processFolder.mkdirs()) { + LOG.log(Level.WARNING, "Failed to create [{0}]", processFolder.getAbsolutePath()); + } final ProcessContainer container = new ProcessContainer( this.errorHandlerRID, nodeId, processID, processFolder, megaBytes, numberOfCores, rackName, this.fileNames, this.processObserver); http://git-wip-us.apache.org/repos/asf/reef/blob/a2222690/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/driver/ProcessContainer.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/driver/ProcessContainer.java b/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/driver/ProcessContainer.java index cf9dfeb..0b2ccc1 100644 --- a/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/driver/ProcessContainer.java +++ b/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/driver/ProcessContainer.java @@ -84,9 +84,13 @@ final class ProcessContainer implements Container { this.processObserver = processObserver; this.reefFolder = new File(folder, fileNames.getREEFFolderName()); this.localFolder = new File(reefFolder, fileNames.getLocalFolderName()); - this.localFolder.mkdirs(); + if (!this.localFolder.exists() && !this.localFolder.mkdirs()) { + LOG.log(Level.WARNING, "Failed to create [{0}]", this.localFolder.getAbsolutePath()); + } this.globalFolder = new File(reefFolder, fileNames.getGlobalFolderName()); - this.globalFolder.mkdirs(); + if (!this.globalFolder.exists() && !this.globalFolder.mkdirs()) { + LOG.log(Level.WARNING, "Failed to create [{0}]", this.globalFolder.getAbsolutePath()); + } } private static void copy(final Iterable<File> files, final File folder) throws IOException { @@ -114,7 +118,10 @@ final class ProcessContainer implements Container { @SuppressWarnings("checkstyle:hiddenfield") public void addGlobalFiles(final File globalFolder) { try { - copy(Arrays.asList(globalFolder.listFiles()), this.globalFolder); + final File[] files = globalFolder.listFiles(); + if (files != null) { + copy(Arrays.asList(files), this.globalFolder); + } } catch (final IOException e) { throw new RuntimeException("Unable to copy files to the evaluator folder.", e); } http://git-wip-us.apache.org/repos/asf/reef/blob/a2222690/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/process/RunnableProcess.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/process/RunnableProcess.java b/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/process/RunnableProcess.java index db46b14..df27f98 100644 --- a/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/process/RunnableProcess.java +++ b/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/process/RunnableProcess.java @@ -101,7 +101,9 @@ public final class RunnableProcess implements Runnable { this.id = id; this.folder = folder; assert this.folder.isDirectory(); - this.folder.mkdirs(); + if (!this.folder.exists() && !this.folder.mkdirs()) { + LOG.log(Level.WARNING, "Failed to create [{0}]", this.folder.getAbsolutePath()); + } this.standardOutFileName = standardOutFileName; this.standardErrorFileName = standardErrorFileName; LOG.log(Level.FINEST, "RunnableProcess ready."); @@ -203,7 +205,9 @@ public final class RunnableProcess implements Runnable { try { if (this.processIsRunning()) { this.process.destroy(); - this.doneCond.await(DESTROY_WAIT_TIME, TimeUnit.MILLISECONDS); + if (!this.doneCond.await(DESTROY_WAIT_TIME, TimeUnit.MILLISECONDS)) { + LOG.log(Level.FINE, "{0} milliseconds elapsed", DESTROY_WAIT_TIME); + } } if (this.processIsRunning()) { http://git-wip-us.apache.org/repos/asf/reef/blob/a2222690/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/client/MesosJobSubmissionHandler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/client/MesosJobSubmissionHandler.java b/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/client/MesosJobSubmissionHandler.java index e48c6fd..5c0a3f8 100644 --- a/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/client/MesosJobSubmissionHandler.java +++ b/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/client/MesosJobSubmissionHandler.java @@ -41,6 +41,8 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; /** * The current implementation runs the driver as a local process, similar to reef-runtime-local. @@ -49,6 +51,8 @@ import java.util.List; @Private @ClientSide final class MesosJobSubmissionHandler implements JobSubmissionHandler { + private static final Logger LOG = Logger.getLogger(MesosJobSubmissionHandler.class.getName()); + public static final String DRIVER_FOLDER_NAME = "driver"; private final ConfigurationSerializer configurationSerializer; @@ -84,13 +88,20 @@ final class MesosJobSubmissionHandler implements JobSubmissionHandler { "/" + jobSubmissionEvent.getIdentifier() + "-" + System.currentTimeMillis() + "/"); final File driverFolder = new File(jobFolder, DRIVER_FOLDER_NAME); - driverFolder.mkdirs(); + if (!driverFolder.exists() && !driverFolder.mkdirs()) { + LOG.log(Level.WARNING, "Failed to create folder {0}", driverFolder.getAbsolutePath()); + } final File reefFolder = new File(driverFolder, this.fileNames.getREEFFolderName()); - reefFolder.mkdirs(); + if (!reefFolder.exists() && !reefFolder.mkdirs()) { + LOG.log(Level.WARNING, "Failed to create folder {0}", reefFolder.getAbsolutePath()); + } final File localFolder = new File(reefFolder, this.fileNames.getLocalFolderName()); - localFolder.mkdirs(); + if (!localFolder.exists() && !localFolder.mkdirs()) { + LOG.log(Level.WARNING, "Failed to create folder {0}", localFolder.getAbsolutePath()); + } + for (final FileResource file : jobSubmissionEvent.getLocalFileSet()) { final Path src = new File(file.getPath()).toPath(); final Path dst = new File(driverFolder, this.fileNames.getLocalFolderPath() + "/" + file.getName()).toPath(); @@ -98,7 +109,10 @@ final class MesosJobSubmissionHandler implements JobSubmissionHandler { } final File globalFolder = new File(reefFolder, this.fileNames.getGlobalFolderName()); - globalFolder.mkdirs(); + if (!globalFolder.exists() && !globalFolder.mkdirs()) { + LOG.log(Level.WARNING, "Failed to create folder {0}", globalFolder.getAbsolutePath()); + } + for (final FileResource file : jobSubmissionEvent.getGlobalFileSet()) { final Path src = new File(file.getPath()).toPath(); final Path dst = new File(driverFolder, this.fileNames.getGlobalFolderPath() + "/" + file.getName()).toPath(); http://git-wip-us.apache.org/repos/asf/reef/blob/a2222690/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/EvaluatorSetupHelper.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/EvaluatorSetupHelper.java b/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/EvaluatorSetupHelper.java index b5b59a9..c28e979 100644 --- a/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/EvaluatorSetupHelper.java +++ b/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/EvaluatorSetupHelper.java @@ -120,7 +120,9 @@ final class EvaluatorSetupHelper { LOG.log(Level.FINE, "Marking [{0}] for deletion at the exit of this JVM and deleting [{1}]", new Object[]{localFile.getAbsolutePath(), localStagingFolder.getAbsolutePath()}); localFile.deleteOnExit(); - localStagingFolder.delete(); + if (!localStagingFolder.delete()) { + LOG.log(Level.WARNING, "Failed to delete [{0}]", localStagingFolder.getAbsolutePath()); + } } else { LOG.log(Level.FINE, "The evaluator staging folder will be kept at [{0}], the JAR at [{1}]", new Object[]{localFile.getAbsolutePath(), localStagingFolder.getAbsolutePath()}); http://git-wip-us.apache.org/repos/asf/reef/blob/a2222690/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/restart/DFSEvaluatorPreserver.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/restart/DFSEvaluatorPreserver.java b/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/restart/DFSEvaluatorPreserver.java index c664c0a..389031e 100644 --- a/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/restart/DFSEvaluatorPreserver.java +++ b/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/restart/DFSEvaluatorPreserver.java @@ -21,6 +21,7 @@ package org.apache.reef.runtime.yarn.driver.restart; import org.apache.commons.lang.StringUtils; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; +import org.apache.hadoop.yarn.api.records.ApplicationId; import org.apache.reef.annotations.Unstable; import org.apache.reef.annotations.audience.DriverSide; import org.apache.reef.annotations.audience.RuntimeAuthor; @@ -35,6 +36,7 @@ import org.apache.reef.tang.annotations.Parameter; import javax.inject.Inject; import java.io.*; import java.nio.charset.StandardCharsets; +import java.util.Arrays; import java.util.HashSet; import java.util.Set; import java.util.logging.Level; @@ -106,9 +108,9 @@ public final class DFSEvaluatorPreserver implements EvaluatorPreserver, AutoClos * @return the folder for Evaluator changelog. */ private static String getEvaluatorChangeLogFolderLocation() { - final String appId = YarnUtilities.getApplicationId().toString(); + final ApplicationId appId = YarnUtilities.getApplicationId(); if (appId != null) { - return appId; + return appId.toString(); } final String jobIdentifier = EvaluatorManager.getJobIdentifier(); @@ -216,7 +218,7 @@ public final class DFSEvaluatorPreserver implements EvaluatorPreserver, AutoClos try { this.close(); } catch (Exception e1) { - LOG.log(Level.SEVERE, "Failed on closing resource with " + e1.getStackTrace()); + LOG.log(Level.SEVERE, "Failed on closing resource with " + Arrays.toString(e1.getStackTrace())); } if (fatalMsg != null) { http://git-wip-us.apache.org/repos/asf/reef/blob/a2222690/lang/java/reef-tang/tang-test-jarA/src/main/java/org/apache/reef/tang/examples/A.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang-test-jarA/src/main/java/org/apache/reef/tang/examples/A.java b/lang/java/reef-tang/tang-test-jarA/src/main/java/org/apache/reef/tang/examples/A.java index 0ae38e7..d9b5a54 100644 --- a/lang/java/reef-tang/tang-test-jarA/src/main/java/org/apache/reef/tang/examples/A.java +++ b/lang/java/reef-tang/tang-test-jarA/src/main/java/org/apache/reef/tang/examples/A.java @@ -19,5 +19,4 @@ package org.apache.reef.tang.examples; public class A { - private int iAmAClass = 0; } http://git-wip-us.apache.org/repos/asf/reef/blob/a2222690/lang/java/reef-tang/tang-tint/src/main/java/org/apache/reef/tang/util/Tint.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang-tint/src/main/java/org/apache/reef/tang/util/Tint.java b/lang/java/reef-tang/tang-tint/src/main/java/org/apache/reef/tang/util/Tint.java index 6eebe89..66a2909 100644 --- a/lang/java/reef-tang/tang-tint/src/main/java/org/apache/reef/tang/util/Tint.java +++ b/lang/java/reef-tang/tang-tint/src/main/java/org/apache/reef/tang/util/Tint.java @@ -393,9 +393,10 @@ public class Tint { try { clz = t.ch.classForName(c.getFullName()); } catch (final ClassNotFoundException e) { + // TODO[JIRA REEF-864] Clarify handling in this case e.printStackTrace(); } - final String typ = clz.isInterface() ? "interface" : "class"; + final String typ = clz == null ? "undefined" : clz.isInterface() ? "interface" : "class"; out.println("<div class='module-margin' id='" + c.getFullName() + "'><div class='decl'>" + "<span class='fullName'>" + typ + " " + c.getFullName() + "</span>"); for (final ConstructorDef<?> d : c.getInjectableConstructors()) { http://git-wip-us.apache.org/repos/asf/reef/blob/a2222690/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/ListInjectionPlan.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/ListInjectionPlan.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/ListInjectionPlan.java index e759b52..87bc263 100644 --- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/ListInjectionPlan.java +++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/ListInjectionPlan.java @@ -97,10 +97,10 @@ public class ListInjectionPlan<T> extends InjectionPlan<T> { public String toShallowString() { final StringBuilder sb = new StringBuilder("list { "); for (final InjectionPlan<T> ip : entries) { - sb.append("\n" + ip.toShallowString()); + sb.append("\n").append(ip.toShallowString()); } sb.append("\n } "); - return null; + return sb.toString(); } } http://git-wip-us.apache.org/repos/asf/reef/blob/a2222690/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/SetInjectionPlan.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/SetInjectionPlan.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/SetInjectionPlan.java index 5fd333a..7838fc3 100644 --- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/SetInjectionPlan.java +++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/SetInjectionPlan.java @@ -69,7 +69,7 @@ public class SetInjectionPlan<T> extends InjectionPlan<T> { final StringBuilder sb = new StringBuilder(getNode().getFullName() + "(set) includes ambiguous plans ["); for (final InjectionPlan<T> ip : entries) { if (ip.isAmbiguous()) { - sb.append("\n" + ip.toAmbiguousInjectString()); + sb.append("\n").append(ip.toAmbiguousInjectString()); } } sb.append("]"); @@ -81,7 +81,7 @@ public class SetInjectionPlan<T> extends InjectionPlan<T> { final StringBuilder sb = new StringBuilder(getNode().getFullName() + "(set) includes infeasible plans ["); for (final InjectionPlan<T> ip : entries) { if (!ip.isFeasible()) { - sb.append("\n" + ip.toInfeasibleInjectString()); + sb.append("\n").append(ip.toInfeasibleInjectString()); } } sb.append("\n]"); @@ -97,10 +97,10 @@ public class SetInjectionPlan<T> extends InjectionPlan<T> { public String toShallowString() { final StringBuilder sb = new StringBuilder("set { "); for (final InjectionPlan<T> ip : entries) { - sb.append("\n" + ip.toShallowString()); + sb.append("\n").append(ip.toShallowString()); } sb.append("\n } "); - return null; + return sb.toString(); } } http://git-wip-us.apache.org/repos/asf/reef/blob/a2222690/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/InjectorImpl.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/InjectorImpl.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/InjectorImpl.java index 9e4a8ac..d24fa5d 100644 --- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/InjectorImpl.java +++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/InjectorImpl.java @@ -388,9 +388,9 @@ public class InjectorImpl implements Injector { if (memo.containsKey(n)) { if (BUILDING == memo.get(n)) { final StringBuilder loopyList = new StringBuilder("["); - for (final Node node : memo.keySet()) { - if (memo.get(node) == BUILDING) { - loopyList.append(" " + node.getFullName()); + for (final Map.Entry<Node, InjectionPlan<?>> node : memo.entrySet()) { + if (node.getValue() == BUILDING) { + loopyList.append(" ").append(node.getKey().getFullName()); } } loopyList.append(" ]"); @@ -722,8 +722,8 @@ public class InjectorImpl implements Injector { namedParameterInstances.put(np, o); } catch (final IllegalArgumentException e) { throw new BindException( - "Attempt to re-bind named parameter " + ReflectionUtilities.getFullName(cl) + ". Old value was [" + old - + "] new value is [" + o + "]"); + "Attempt to bind named parameter " + ReflectionUtilities.getFullName(cl) + " failed. " + + "Value is [" + o + "]"); } } else { http://git-wip-us.apache.org/repos/asf/reef/blob/a2222690/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/types/ConstructorArgImpl.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/types/ConstructorArgImpl.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/types/ConstructorArgImpl.java index 087e1ed..bd0b70b 100644 --- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/types/ConstructorArgImpl.java +++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/types/ConstructorArgImpl.java @@ -66,10 +66,7 @@ public class ConstructorArgImpl implements ConstructorArg { if (name == null && arg.name == null) { return true; } - if (name == null && arg.name != null) { - return false; - } - if (name != null && arg.name == null) { + if (name == null || arg.name == null) { return false; } return name.equals(arg.name); http://git-wip-us.apache.org/repos/asf/reef/blob/a2222690/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/walk/Walk.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/walk/Walk.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/walk/Walk.java index 0010523..2858600 100644 --- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/walk/Walk.java +++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/walk/Walk.java @@ -55,7 +55,7 @@ public final class Walk { } } else { for (final T child : node.getChildren()) { - if (!preorder(nodeVisitor, edgeVisitor, child)) { + if (!preorder(nodeVisitor, null, child)) { return false; } } http://git-wip-us.apache.org/repos/asf/reef/blob/a2222690/lang/java/reef-tests/src/main/java/org/apache/reef/tests/messaging/driver/DriverMessaging.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tests/src/main/java/org/apache/reef/tests/messaging/driver/DriverMessaging.java b/lang/java/reef-tests/src/main/java/org/apache/reef/tests/messaging/driver/DriverMessaging.java index 76875e2..dfe350d 100644 --- a/lang/java/reef-tests/src/main/java/org/apache/reef/tests/messaging/driver/DriverMessaging.java +++ b/lang/java/reef-tests/src/main/java/org/apache/reef/tests/messaging/driver/DriverMessaging.java @@ -108,7 +108,9 @@ public final class DriverMessaging { } this.reef.close(); - return this.status; + synchronized (this) { + return this.status; + } } final class JobMessageHandler implements EventHandler<JobMessage> { http://git-wip-us.apache.org/repos/asf/reef/blob/a2222690/lang/java/reef-tests/src/main/java/org/apache/reef/tests/statepassing/StatePassingDriver.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tests/src/main/java/org/apache/reef/tests/statepassing/StatePassingDriver.java b/lang/java/reef-tests/src/main/java/org/apache/reef/tests/statepassing/StatePassingDriver.java index 465014f..f87d9e8 100644 --- a/lang/java/reef-tests/src/main/java/org/apache/reef/tests/statepassing/StatePassingDriver.java +++ b/lang/java/reef-tests/src/main/java/org/apache/reef/tests/statepassing/StatePassingDriver.java @@ -26,8 +26,6 @@ import org.apache.reef.driver.evaluator.AllocatedEvaluator; import org.apache.reef.driver.task.CompletedTask; import org.apache.reef.driver.task.TaskConfiguration; import org.apache.reef.tang.Configuration; -import org.apache.reef.tang.JavaConfigurationBuilder; -import org.apache.reef.tang.Tang; import org.apache.reef.tang.annotations.Unit; import org.apache.reef.tang.exceptions.BindException; import org.apache.reef.wake.EventHandler; @@ -74,7 +72,6 @@ public class StatePassingDriver { final class EvaluatorAllocatedHandler implements EventHandler<AllocatedEvaluator> { @Override public void onNext(final AllocatedEvaluator eb) { - final JavaConfigurationBuilder b = Tang.Factory.getTang().newConfigurationBuilder(); try { final Configuration contextConfiguration = ContextConfiguration.CONF .set(ContextConfiguration.IDENTIFIER, "StatePassingContext") http://git-wip-us.apache.org/repos/asf/reef/blob/a2222690/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/ParsedHttpRequest.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/ParsedHttpRequest.java b/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/ParsedHttpRequest.java index b63f634..222c48b 100644 --- a/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/ParsedHttpRequest.java +++ b/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/ParsedHttpRequest.java @@ -71,7 +71,7 @@ public final class ParsedHttpRequest { this.version = parts.length > 2 ? parts[2] : null; this.targetEntity = parts.length > 3 ? parts[3] : null; - if (this.queryString != null && !this.queryString.isEmpty()) { + if (!this.queryString.isEmpty()) { final String[] pairs = this.queryString.split("&"); for (final String pair : pairs) { final int idx = pair.indexOf("="); http://git-wip-us.apache.org/repos/asf/reef/blob/a2222690/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/ReefEventStateManager.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/ReefEventStateManager.java b/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/ReefEventStateManager.java index 21c0b04..f60c19c 100644 --- a/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/ReefEventStateManager.java +++ b/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/ReefEventStateManager.java @@ -126,7 +126,7 @@ public final class ReefEventStateManager { */ private String convertTime(final long time) { final Date date = new Date(time); - return FORMAT.format(date).toString(); + return FORMAT.format(date); } /**
