You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2016/03/29 14:20:18 UTC
[2/2] incubator-slider git commit: SLIDER-1105 IDE warning about a
couple of lines in ServiceLauncher
SLIDER-1105
IDE warning about a couple of lines in ServiceLauncher
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/e5ebd266
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/e5ebd266
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/e5ebd266
Branch: refs/heads/develop
Commit: e5ebd266bc9e12c7354f6d9a8c62f6f8d555d4ca
Parents: 12a96f7
Author: Steve Loughran <st...@apache.org>
Authored: Tue Mar 29 13:20:04 2016 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Tue Mar 29 13:20:04 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/slider/client/rest/RestClientFactory.java | 2 +-
.../main/java/org/apache/slider/core/main/ServiceLauncher.java | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e5ebd266/slider-core/src/main/java/org/apache/slider/client/rest/RestClientFactory.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/client/rest/RestClientFactory.java b/slider-core/src/main/java/org/apache/slider/client/rest/RestClientFactory.java
index 9c18036..4286596 100644
--- a/slider-core/src/main/java/org/apache/slider/client/rest/RestClientFactory.java
+++ b/slider-core/src/main/java/org/apache/slider/client/rest/RestClientFactory.java
@@ -30,7 +30,7 @@ import java.io.IOException;
import static org.apache.slider.server.appmaster.web.rest.RestPaths.SLIDER_PATH_APPLICATION;
/**
- * Factory for the Rest cilent; hides the lookup and instantiation.
+ * Factory for the Rest client; hides the lookup and instantiation.
* <p>
*
*/
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e5ebd266/slider-core/src/main/java/org/apache/slider/core/main/ServiceLauncher.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/core/main/ServiceLauncher.java b/slider-core/src/main/java/org/apache/slider/core/main/ServiceLauncher.java
index cf6d21f..f192ec8 100644
--- a/slider-core/src/main/java/org/apache/slider/core/main/ServiceLauncher.java
+++ b/slider-core/src/main/java/org/apache/slider/core/main/ServiceLauncher.java
@@ -87,7 +87,7 @@ public class ServiceLauncher<S extends Service>
private volatile S service;
private int serviceExitCode;
@SuppressWarnings("MismatchedQueryAndUpdateOfCollection")
- private final List<IrqHandler> interruptHandlers = new ArrayList<IrqHandler>(1);
+ private final List<IrqHandler> interruptHandlers = new ArrayList<>(1);
private Configuration configuration;
private String serviceClassName;
private static AtomicBoolean signalAlreadyReceived = new AtomicBoolean(false);
@@ -447,7 +447,7 @@ public class ServiceLauncher<S extends Service>
try {
conf.addResource(file.toURI().toURL());
} catch (MalformedURLException e) {
- LOG.debug("File {} cannot be converted to URL: {}", e);
+ LOG.debug("File {} cannot be converted to URL", file, e);
exitWithMessage(EXIT_COMMAND_ARGUMENT_ERROR,
ARG_CONF + ": configuration file path invalid: " + file);
}
@@ -626,7 +626,7 @@ public class ServiceLauncher<S extends Service>
Thread.setDefaultUncaughtExceptionHandler(
new YarnUncaughtExceptionHandler());
- ServiceLauncher serviceLauncher = new ServiceLauncher<Service>(serviceClassName);
+ ServiceLauncher serviceLauncher = new ServiceLauncher<>(serviceClassName);
serviceLauncher.launchServiceAndExit(argsList);
}
}