Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Ferrazzutti2014-08-12 18:15:17 +0000
committerRoland Grunberg2014-08-12 20:05:32 +0000
commit7a4f3a3c2e7ce9e0b6e546a411f10feb9d49eeb6 (patch)
tree1f14315b1e276ef58c5994fade67e9f945a6e6eb /systemtap
parent94a114eb8503463214e225d5863b86bab36b2484 (diff)
downloadorg.eclipse.linuxtools-7a4f3a3c2e7ce9e0b6e546a411f10feb9d49eeb6.tar.gz
org.eclipse.linuxtools-7a4f3a3c2e7ce9e0b6e546a411f10feb9d49eeb6.tar.xz
org.eclipse.linuxtools-7a4f3a3c2e7ce9e0b6e546a411f10feb9d49eeb6.zip
Systemtap: Reset launcher's cmdList each run.
Resolves EBZ #441629. Also perform some very minor cleanup on RunScriptHandler. Change-Id: I23714435658eba9abc72d7eeee88f70e2544b051 Signed-off-by: Andrew Ferrazzutti <aferrazz@redhat.com> Reviewed-on: https://git.eclipse.org/r/31463 Reviewed-by: Roland Grunberg <rgrunber@redhat.com> Tested-by: Roland Grunberg <rgrunber@redhat.com> Tested-by: Hudson CI
Diffstat (limited to 'systemtap')
-rw-r--r--systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/handlers/RunScriptHandler.java7
1 files changed, 3 insertions, 4 deletions
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/handlers/RunScriptHandler.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/handlers/RunScriptHandler.java
index 74185fd7cf..092f654d39 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/handlers/RunScriptHandler.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/handlers/RunScriptHandler.java
@@ -74,7 +74,6 @@ public class RunScriptHandler extends AbstractHandler {
/**
* @since 2.0
*/
- protected boolean continueRun = true;
private RemoteScriptOptions remoteOptions = null;
private IEditorPart targetEditor = null;
private String fileName = null;
@@ -109,7 +108,7 @@ public class RunScriptHandler extends AbstractHandler {
* @param option
*/
public void addComandLineOptions(String option) {
- this.cmdList.add(option);
+ cmdList.add(option);
}
/**
@@ -156,6 +155,7 @@ public class RunScriptHandler extends AbstractHandler {
}
private void executeAction(ExecutionEvent event) throws ExecutionException {
+ cmdList.clear();
final boolean local = getRunLocal();
findTargetEditor(event);
findFilePath();
@@ -239,7 +239,7 @@ public class RunScriptHandler extends AbstractHandler {
}
private boolean editorMatchesPath(IEditorInput input) {
- return input instanceof IPathEditorInput && ((IPathEditorInput) (input)).getPath().equals(this.path);
+ return input instanceof IPathEditorInput && ((IPathEditorInput) (input)).getPath().equals(path);
}
/**
@@ -399,7 +399,6 @@ public class RunScriptHandler extends AbstractHandler {
// Make sure script name only contains underscores and/or alphanumeric characters.
if (!Pattern.matches("^[a-z0-9_A-Z]+$", //$NON-NLS-1$
getFileNameWithoutExtension(getFileName(fileName)))) {
- continueRun = false;
throw new ExecutionException(Messages.RunScriptHandler_InvalidScriptMessage);
}

Back to the top