Author: jbonofre
Date: Sat Sep 7 19:45:10 2013
New Revision: 1520798
URL: http://svn.apache.org/r1520798
Log:
[KARAF-1976] Escape sub-shell commands from the DefaultActionPreparator
Modified:
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/commands/basic/DefaultActionPreparator.java
Modified:
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/commands/basic/DefaultActionPreparator.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/commands/basic/DefaultActionPreparator.java?rev=1520798&r1=1520797&r2=1520798&view=diff
==============================================================================
---
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/commands/basic/DefaultActionPreparator.java
(original)
+++
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/commands/basic/DefaultActionPreparator.java
Sat Sep 7 19:45:10 2013
@@ -51,6 +51,12 @@ public class DefaultActionPreparator imp
Map<Argument, Field> arguments = actionMetaData.getArguments();
List<Argument> orderedArguments = actionMetaData.getOrderedArguments();
Command command2 = actionMetaData.getCommand();
+
+ if (command2 == null) {
+ // to avoid NPE with subshell
+ return true;
+ }
+
String commandErrorSt = (command2 != null) ? Ansi.ansi()
.fg(Ansi.Color.RED)
.a("Error executing command ")
