From 08ad89dc19ebd2578be53808c235a7e728acdb4c Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Sat, 14 May 2011 16:38:17 +0200 Subject: [PATCH] fix NullPointerException in SubCommandHandler --- .../java/sonia/scm/cli/SubCommandHandler.java | 4 +-- .../services/sonia.scm.cli.SubCommand | 28 +++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 scm-clients/scm-cli-client/src/main/resources/META-INF/services/sonia.scm.cli.SubCommand diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/SubCommandHandler.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/SubCommandHandler.java index 425f172486..7fd15b66be 100644 --- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/SubCommandHandler.java +++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/SubCommandHandler.java @@ -65,7 +65,7 @@ public class SubCommandHandler extends OptionHandler /** Field description */ public static final String RESOURCE_SERVICES = - "META-INF/services/".concat(SubCommand.class.getName()); + "/META-INF/services/".concat(SubCommand.class.getName()); /** the logger for SubCommandHandler */ private static final Logger logger = @@ -151,7 +151,7 @@ public class SubCommandHandler extends OptionHandler { reader = new BufferedReader( new InputStreamReader( - getClass().getResourceAsStream(RESOURCE_SERVICES))); + SubCommand.class.getResourceAsStream(RESOURCE_SERVICES))); String line = reader.readLine(); diff --git a/scm-clients/scm-cli-client/src/main/resources/META-INF/services/sonia.scm.cli.SubCommand b/scm-clients/scm-cli-client/src/main/resources/META-INF/services/sonia.scm.cli.SubCommand new file mode 100644 index 0000000000..b89f4c91f3 --- /dev/null +++ b/scm-clients/scm-cli-client/src/main/resources/META-INF/services/sonia.scm.cli.SubCommand @@ -0,0 +1,28 @@ +# Copyright (c) 2010, Sebastian Sdorra +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, +# this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions and the following disclaimer in the documentation +# and/or other materials provided with the distribution. +# 3. Neither the name of SCM-Manager; nor the names of its +# contributors may be used to endorse or promote products derived from this +# software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY +# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# http://bitbucket.org/sdorra/scm-manager +# \ No newline at end of file