[SCM] master: Fix ViewsetCommand error for load/unload command.

[rmoseley@sourceware.org]

The branch, master has been updated
       via  e5a45290eaa2d95ae971591d15f2cb79a10b6cc7 (commit)
      from  079a3dcbfa8d03af12f3c218a198318e48d9a2e2 (commit)

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

- Log -----------------------------------------------------------------
commit e5a45290eaa2d95ae971591d15f2cb79a10b6cc7
Author: Rick Moseley <rmoseley@localhost.localdomain>
Date:   Wed Feb 27 23:31:20 2008 -0600

    Fix ViewsetCommand error for load/unload command.
    
    * ViewsetCommand.java: Fix error when duplicate executables are
      loaded/unloaded(bz 5799).

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

Summary of changes:
 frysk-core/frysk/hpd/ChangeLog           |    6 ++++++
 frysk-core/frysk/hpd/ViewsetCommand.java |    5 ++++-
 2 files changed, 10 insertions(+), 1 deletions(-)

First 500 lines of diff:
diff --git a/frysk-core/frysk/hpd/ChangeLog b/frysk-core/frysk/hpd/ChangeLog
index c876cd2..28d1f25 100644
--- a/frysk-core/frysk/hpd/ChangeLog
+++ b/frysk-core/frysk/hpd/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-27  Rick Moseley  <rmoseley@redhat.com>
+
+	* ViewsetCommand.java: Fix error when duplicate executables are
+	loaded/unloaded(bz 5799).
+
+
 2008-02-27  Sami Wagiaalla  <swagiaal@redhat.com>
 
 	* StackCommands.java: Use PrintStackOptions instead of boolean list.
diff --git a/frysk-core/frysk/hpd/ViewsetCommand.java b/frysk-core/frysk/hpd/ViewsetCommand.java
index 25be163..a72d9fb 100644
--- a/frysk-core/frysk/hpd/ViewsetCommand.java
+++ b/frysk-core/frysk/hpd/ViewsetCommand.java
@@ -88,6 +88,9 @@ class ViewsetCommand extends ParameterizedCommand {
      * 
      * @param tempset is the target set to use in printing
      * @param cli is the current command line interface object
+     * @param displayedName is the String used for the title of the set
+     * @param loadedOnly is true if the display is to show procs that exist in the 
+     * 		cli.loadeProcs table only, false if not
      */
     
     static void printLoop(PTSet tempset, CLI cli, String displayedName, boolean loadedOnly) {
@@ -97,7 +100,7 @@ class ViewsetCommand extends ParameterizedCommand {
 	cli.outWriter.println("\tpid\tid\tpath-to-executable");
 	for (Iterator iter = tempset.getTaskData(); iter.hasNext();) {
 	    temptd = (TaskData) iter.next();
-	    if (loadedOnly && cli.loadedProcs.containsKey(temptd.getTask().getProc())
+	    if (loadedOnly && cli.loadedProcs.containsValue(new Integer(temptd.getID()))
 		    || !loadedOnly) {
 		cli.outWriter.print("[");
 		cli.outWriter.print(temptd.getParentID());


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