diff --git a/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/shells/Patterns.java b/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/shells/Patterns.java index 88db9697460..2810a88f37b 100644 --- a/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/shells/Patterns.java +++ b/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/shells/Patterns.java @@ -98,13 +98,18 @@ public class Patterns { CommandPattern curCommand; ParsedOutput matchedOutput = null; int commands = _theCommands.size(); - if (_currentCommand != null) { - for (int i = 0; i < commands; i++) { + if (_currentCommand != null) + { + + for (int i = 0; i < commands; i++) + { curCommand = (CommandPattern) _theCommands.get(i); - if (curCommand.matchCommand(_currentCommand)) { + if (curCommand.matchCommand(_currentCommand)) + { matchedOutput = curCommand.matchLine(theLine); } - if (matchedOutput != null) { + if (matchedOutput != null) + { return matchedOutput; } } diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.local/src/org/eclipse/rse/subsystems/shells/local/model/LocalServiceCommandShell.java b/rse/plugins/org.eclipse.rse.subsystems.shells.local/src/org/eclipse/rse/subsystems/shells/local/model/LocalServiceCommandShell.java index a4049895d59..10776eb3072 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.shells.local/src/org/eclipse/rse/subsystems/shells/local/model/LocalServiceCommandShell.java +++ b/rse/plugins/org.eclipse.rse.subsystems.shells.local/src/org/eclipse/rse/subsystems/shells/local/model/LocalServiceCommandShell.java @@ -82,6 +82,10 @@ public class LocalServiceCommandShell extends ServiceCommandShell { type = parsedMsg.type; } + else + { + System.out.println("parsedMsg = null"); + } if (event.isError()) { output = new RemoteError(this, type); @@ -124,8 +128,9 @@ public class LocalServiceCommandShell extends ServiceCommandShell public void writeToShell(String cmd) { - super.writeToShell(cmd); _patterns.update(cmd); + super.writeToShell(cmd); + } }