Return-Path: X-Original-To: apmail-felix-commits-archive@www.apache.org Delivered-To: apmail-felix-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9653B11D33 for ; Sun, 27 Apr 2014 06:58:39 +0000 (UTC) Received: (qmail 88412 invoked by uid 500); 27 Apr 2014 06:58:38 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 88265 invoked by uid 500); 27 Apr 2014 06:58:37 -0000 Mailing-List: contact commits-help@felix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@felix.apache.org Delivered-To: mailing list commits@felix.apache.org Received: (qmail 88245 invoked by uid 99); 27 Apr 2014 06:58:30 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 27 Apr 2014 06:58:30 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 27 Apr 2014 06:58:30 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8700123889DA; Sun, 27 Apr 2014 06:58:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1590351 - /felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/ScrShellCommand.java Date: Sun, 27 Apr 2014 06:58:07 -0000 To: commits@felix.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140427065807.8700123889DA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: djencks Date: Sun Apr 27 06:58:07 2014 New Revision: 1590351 URL: http://svn.apache.org/r1590351 Log: FELIX-4469 scrcommand help should not give NPE Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/ScrShellCommand.java Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/ScrShellCommand.java URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/ScrShellCommand.java?rev=1590351&r1=1590350&r2=1590351&view=diff ============================================================================== --- felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/ScrShellCommand.java (original) +++ felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/ScrShellCommand.java Sun Apr 27 06:58:07 2014 @@ -113,7 +113,7 @@ class ScrShellCommand implements Command private void help(PrintStream out, String command) { - if (command.equals(LIST_CMD)) + if (LIST_CMD.equals( command )) { out.println(""); out.println("scr " + LIST_CMD + " [ ]"); @@ -122,7 +122,7 @@ class ScrShellCommand implements Command + "added, only the components of the selected bundles are listed."); out.println(""); } - else if (command.equals(INFO_CMD)) + else if (INFO_CMD.equals( command )) { out.println(""); out.println("scr " + INFO_CMD + " "); @@ -131,7 +131,7 @@ class ScrShellCommand implements Command + "component ID is given as command argument."); out.println(""); } - else if (command.equals(ENABLE_CMD)) + else if (ENABLE_CMD.equals( command )) { out.println(""); out.println("scr " + ENABLE_CMD + " "); @@ -139,7 +139,7 @@ class ScrShellCommand implements Command out.println("This command enables the component whose component ID\n" + "is given as command argument."); out.println(""); } - else if (command.equals(DISABLE_CMD)) + else if (DISABLE_CMD.equals( command )) { out.println(""); out.println("scr " + DISABLE_CMD + " "); @@ -147,7 +147,7 @@ class ScrShellCommand implements Command out.println("This command disables the component whose component ID\n" + "is given as command argument."); out.println(""); } - else if (command.equals(CONFIG_CMD)) + else if (CONFIG_CMD.equals( command )) { out.println(""); out.println("scr " + CONFIG_CMD);