svn commit: r1541947 - /karaf/branches/karaf-2.x/shell/console/src/main/java/org/apache/karaf/shell/console/NameScoping.java

[jb...@apache.org]

Author: jbonofre
Date: Thu Nov 14 16:05:56 2013
New Revision: 1541947

URL: http://svn.apache.org/r1541947
Log:
[KARAF-2577] Fix --help option on the bin/admin script

Modified:
    karaf/branches/karaf-2.x/shell/console/src/main/java/org/apache/karaf/shell/console/NameScoping.java

Modified: karaf/branches/karaf-2.x/shell/console/src/main/java/org/apache/karaf/shell/console/NameScoping.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/shell/console/src/main/java/org/apache/karaf/shell/console/NameScoping.java?rev=1541947&r1=1541946&r2=1541947&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/shell/console/src/main/java/org/apache/karaf/shell/console/NameScoping.java (original)
+++ karaf/branches/karaf-2.x/shell/console/src/main/java/org/apache/karaf/shell/console/NameScoping.java Thu Nov 14 16:05:56 2013
@@ -50,6 +50,9 @@ public class NameScoping {
      * Returns true if the given scope is the global scope so that it can be hidden from help messages
      */
     public static boolean isGlobalScope(CommandSession session, String scope) {
+        if (session == null)
+            return false;
+
         if (!isMultiScopeMode(session)) {
             String globalScope = (String) session.get("APPLICATION");
             if (globalScope != null) {
@@ -64,6 +67,9 @@ public class NameScoping {
      * avoid prefixing commands with their scope
      */
     public static boolean isMultiScopeMode(CommandSession session) {
+        if (session == null)
+            return false;
+
         Object value = session.get(MULTI_SCOPE_MODE_KEY);
         if (value != null && value.equals("false")) {
             return false;