From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6895 invoked by alias); 17 Jan 2008 16:13:30 -0000 Received: (qmail 6869 invoked by uid 9519); 17 Jan 2008 16:13:29 -0000 Date: Thu, 17 Jan 2008 16:13:00 -0000 Message-ID: <20080117161329.6854.qmail@sourceware.org> From: rmoseley@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Test for valid proc before proceeding. X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 00b9fa35668c84c9899076d86c7e3a2ff7c6347e X-Git-Newrev: 00e5ef40ff4db4cd2aa482d491e271b0f1ee6fe0 Mailing-List: contact frysk-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: frysk-cvs-owner@sourceware.org Reply-To: frysk@sourceware.org X-SW-Source: 2008-q1/txt/msg00072.txt.bz2 The branch, master has been updated via 00e5ef40ff4db4cd2aa482d491e271b0f1ee6fe0 (commit) from 00b9fa35668c84c9899076d86c7e3a2ff7c6347e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 00e5ef40ff4db4cd2aa482d491e271b0f1ee6fe0 Author: Rick Moseley Date: Thu Jan 17 10:13:04 2008 -0600 Test for valid proc before proceeding. * SteppingEngine.java: Test for valid proc before proceeding. ----------------------------------------------------------------------- Summary of changes: frysk-core/frysk/stepping/ChangeLog | 4 ++++ frysk-core/frysk/stepping/SteppingEngine.java | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) First 500 lines of diff: diff --git a/frysk-core/frysk/stepping/ChangeLog b/frysk-core/frysk/stepping/ChangeLog index 2f37e23..c263c88 100644 --- a/frysk-core/frysk/stepping/ChangeLog +++ b/frysk-core/frysk/stepping/ChangeLog @@ -1,3 +1,7 @@ +2008-01-17 Rick Moseley + + * SteppingEngine.java: Test for valid proc before proceeding. + 2008-01-14 Mike Cvet * InstructionStepThroughState.java: Added, fixing #5260. * InstructionStepState.java (handleUpdate): Added code to diff --git a/frysk-core/frysk/stepping/SteppingEngine.java b/frysk-core/frysk/stepping/SteppingEngine.java index fe53d74..6a07afe 100644 --- a/frysk-core/frysk/stepping/SteppingEngine.java +++ b/frysk-core/frysk/stepping/SteppingEngine.java @@ -1183,7 +1183,7 @@ public class SteppingEngine { * as terminated and notify the observers of the event. */ Proc proc = task.getProc(); Integer context = (Integer)SteppingEngine.this.contextMap.get(proc); - if (!SteppingEngine.this.contextMap.isEmpty()) + if (!SteppingEngine.this.contextMap.isEmpty() && context != null) SteppingEngine.this.contextMap.put(proc, new Integer( context.intValue() - 1)); hooks/post-receive -- frysk system monitor/debugger