[SCM] master: Fix bz #5373.

[SCM] master: Fix bz #5373.

[rmoseley]

The branch, master has been updated
       via  c1fd6f37ec54c0d81fa3b56f4611832df6574dcd (commit)
      from  3f179370e640e8f156df2f90a48855ed11446e34 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit c1fd6f37ec54c0d81fa3b56f4611832df6574dcd
Author: Rick Moseley <rmoseley@redhat.com>
Date:   Tue Nov 20 10:54:51 2007 -0600

    Fix bz #5373.
    
    * RunCommand.java: Clear loadedProcs HashMap when done.
    * TestLoadCommand.java: Add test for the above change.

-----------------------------------------------------------------------

Summary of changes:
 frysk-core/frysk/hpd/ChangeLog            |    5 +++++
 frysk-core/frysk/hpd/RunCommand.java      |    4 +++-
 frysk-core/frysk/hpd/TestLoadCommand.java |   16 ++++++++++++++++
 3 files changed, 24 insertions(+), 1 deletions(-)

First 500 lines of diff:
diff --git a/frysk-core/frysk/hpd/ChangeLog b/frysk-core/frysk/hpd/ChangeLog
index 1fe6716..460da66 100644
--- a/frysk-core/frysk/hpd/ChangeLog
+++ b/frysk-core/frysk/hpd/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-20  Rick Moseley  <rmoseley@redhat.com>
+
+	* RunCommand.java: Clear loadedProcs HashMap when done.
+	* TestLoadCommand.java: Add test for the above change.
+
 2007-11-19  Rick Moseley  <rmoseley@redhat.com>
 
 	* RunCommand.java: Fix bz# 5369; jazz up the help message.
diff --git a/frysk-core/frysk/hpd/RunCommand.java b/frysk-core/frysk/hpd/RunCommand.java
index c813b84..3f8a0b1 100644
--- a/frysk-core/frysk/hpd/RunCommand.java
+++ b/frysk-core/frysk/hpd/RunCommand.java
@@ -155,11 +155,13 @@ class RunCommand extends ParameterizedCommand {
 		    cli.taskID = taskid.intValue();
 		}
 		cli.execCommand("run " + proc.getExe());
-		procSet.remove(proc);
 		synchronized(cli) {
 		    cli.taskID = -1;
 		}
 	    }
+	    synchronized (cli) {
+		cli.loadedProcs.clear();
+	    }
 	}
 	// Found no loaded procs, print usage message
 	// XXX Need to fix, add core files and running proc handling
diff --git a/frysk-core/frysk/hpd/TestLoadCommand.java b/frysk-core/frysk/hpd/TestLoadCommand.java
index 10eeee4..cc709b6 100644
--- a/frysk-core/frysk/hpd/TestLoadCommand.java
+++ b/frysk-core/frysk/hpd/TestLoadCommand.java
@@ -87,4 +87,20 @@ public class TestLoadCommand extends TestLib {
 	e.expect(5, "[1.0]*" + prompt);
 	e.close();
     }
+    
+    public void testLoadRunRun() {
+	e = new HpdTestbed();
+	e.send("load " + Config.getPkgLibFile("funit-hello").getPath()
+		+ "\n");
+	e.expect(5, "Loaded executable file.*" + prompt);
+	e.send("load " + Config.getPkgLibFile("funit-hello").getPath()
+		+ "\n");
+	e.expect(5, "Loaded executable file.*" + prompt);
+	e.send("run\n");
+	e.expect(5, "Attached to process*");
+	e.expect(5, "Attached to process*");
+	e.send("run\n");
+	e.expect(5, "Error: missing program");
+	e.close();
+    }
 }


hooks/post-receive
--
frysk system monitor/debugger