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 2014/08/01 16:30:47 UTC
[1/2] git commit: SliderLauncher: javadocs,
unchecked warning suppression, and logging
Repository: incubator-slider
Updated Branches:
refs/heads/develop 2ee8374eb -> 120c3b9c4
SliderLauncher: javadocs, unchecked warning suppression, and logging
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/54eec9d4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/54eec9d4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/54eec9d4
Branch: refs/heads/develop
Commit: 54eec9d47948b65e4be5bdfb0d72676ed806faec
Parents: 572effb
Author: Steve Loughran <st...@apache.org>
Authored: Fri Aug 1 15:29:24 2014 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Fri Aug 1 15:29:24 2014 +0100
----------------------------------------------------------------------
.../java/org/apache/slider/core/main/ServiceLauncher.java | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/54eec9d4/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 c92dfda..846aca1 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
@@ -202,15 +202,11 @@ public class ServiceLauncher<S extends Service>
* to the configuration, and <code>service</code> to the service.
*
* @param conf configuration to use
- * @throws ClassNotFoundException no such class
- * @throws InstantiationException no empty constructor,
- * problems with dependencies
* @throws ClassNotFoundException classname not on the classpath
* @throws IllegalAccessException not allowed at the class
* @throws InstantiationException not allowed to instantiate it
- * @throws InterruptedException thread interrupted
- * @throws Throwable any other failure
*/
+ @SuppressWarnings("unchecked")
public Service instantiateService(Configuration conf)
throws ClassNotFoundException, InstantiationException, IllegalAccessException,
ExitUtil.ExitException, NoSuchMethodException, InvocationTargetException {
@@ -447,6 +443,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);
exitWithMessage(EXIT_COMMAND_ARGUMENT_ERROR,
ARG_CONF + ": configuration file path invalid: " + file);
}
[2/2] git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/incubator-slider into develop
Posted by st...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-slider into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/120c3b9c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/120c3b9c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/120c3b9c
Branch: refs/heads/develop
Commit: 120c3b9c4684ecc8233a40f544e5ef8325440614
Parents: 54eec9d 2ee8374
Author: Steve Loughran <st...@apache.org>
Authored: Fri Aug 1 15:29:40 2014 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Fri Aug 1 15:29:40 2014 +0100
----------------------------------------------------------------------
.../org/apache/slider/providers/agent/AgentProviderService.java | 4 +++-
.../org/apache/slider/providers/hbase/HBaseClientProvider.java | 2 ++
.../main/java/org/apache/slider/providers/hbase/HBaseKeys.java | 4 ++++
.../org/apache/slider/providers/hbase/HBaseProviderService.java | 5 +++++
.../main/java/org/apache/slider/providers/hbase/HBaseRoles.java | 3 +++
5 files changed, 17 insertions(+), 1 deletion(-)
----------------------------------------------------------------------