Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-13 17:05:43 +01:00
Code Issues Packages Projects Releases Activity

fix NullPointerException in SubCommandHandler

Browse Source
This commit is contained in:
Sebastian Sdorra
2011-05-14 16:38:17 +02:00
parent 9daac42083
commit 08ad89dc19
2 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/SubCommandHandler.java
View File

@@ -65,7 +65,7 @@ public class SubCommandHandler extends OptionHandler<SubCommand>
/** Field description */ /** Field description */
public static final String RESOURCE_SERVICES = public static final String RESOURCE_SERVICES =
"META-INF/services/".concat(SubCommand.class.getName()); "/META-INF/services/".concat(SubCommand.class.getName());
/** the logger for SubCommandHandler */ /** the logger for SubCommandHandler */
private static final Logger logger = private static final Logger logger =
@@ -151,7 +151,7 @@ public class SubCommandHandler extends OptionHandler<SubCommand>
{ {
reader = new BufferedReader( reader = new BufferedReader(
new InputStreamReader( new InputStreamReader(
getClass().getResourceAsStream(RESOURCE_SERVICES))); SubCommand.class.getResourceAsStream(RESOURCE_SERVICES)));
String line = reader.readLine(); String line = reader.readLine();

28
scm-clients/scm-cli-client/src/main/resources/META-INF/services/sonia.scm.cli.SubCommand Normal file
View File

@@ -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
#