Return-Path: X-Original-To: apmail-flex-commits-archive@www.apache.org Delivered-To: apmail-flex-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2FC06116DB for ; Sat, 24 May 2014 12:59:05 +0000 (UTC) Received: (qmail 84592 invoked by uid 500); 24 May 2014 12:59:05 -0000 Delivered-To: apmail-flex-commits-archive@flex.apache.org Received: (qmail 84558 invoked by uid 500); 24 May 2014 12:59:05 -0000 Mailing-List: contact commits-help@flex.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flex.apache.org Delivered-To: mailing list commits@flex.apache.org Received: (qmail 84547 invoked by uid 99); 24 May 2014 12:59:05 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 24 May 2014 12:59:05 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D18679A3BC6; Sat, 24 May 2014 12:59:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: fthomas@apache.org To: commits@flex.apache.org Date: Sat, 24 May 2014 12:59:04 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: [flex-sdk] [refs/heads/FDBWorkers] - FLEX-34332: info frame should return info in the context of the current worker. Repository: flex-sdk Updated Branches: refs/heads/FDBWorkers 828a0524f -> df0fceaee FLEX-34332: info frame should return info in the context of the current worker. Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/401ab387 Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/401ab387 Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/401ab387 Branch: refs/heads/FDBWorkers Commit: 401ab387382fff510bb79f43eb7e2893a0f0e0ff Parents: 828a052 Author: Fr�d�ric THMOAS Authored: Sat May 24 13:56:34 2014 +0100 Committer: Fr�d�ric THMOAS Committed: Sat May 24 13:56:34 2014 +0100 ---------------------------------------------------------------------- modules/debugger/src/java/flex/tools/debugger/cli/DebugCLI.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/401ab387/modules/debugger/src/java/flex/tools/debugger/cli/DebugCLI.java ---------------------------------------------------------------------- diff --git a/modules/debugger/src/java/flex/tools/debugger/cli/DebugCLI.java b/modules/debugger/src/java/flex/tools/debugger/cli/DebugCLI.java index 940f371..98f2595 100644 --- a/modules/debugger/src/java/flex/tools/debugger/cli/DebugCLI.java +++ b/modules/debugger/src/java/flex/tools/debugger/cli/DebugCLI.java @@ -3674,7 +3674,7 @@ public class DebugCLI implements Runnable, SourceLocator { // @throws ArrayIndexOutOfBoundsException if frame 'frm' doesn't exist void dumpFrame(int frm) throws PlayerDebugException, ArrayIndexOutOfBoundsException { StringBuilder sb = new StringBuilder(); - Frame[] ar = m_session.getFrames(); + Frame[] ar = m_session.getWorkerSession(m_activeIsolate).getFrames(); appendFrameInfo(sb, ar[frm], frm, false, true); sb.append(m_newline); @@ -3684,7 +3684,7 @@ public class DebugCLI implements Runnable, SourceLocator { // set the listing command to point to the file/line of the given frame void setListingToFrame(int frameNum) throws PlayerDebugException { // set the module and line - Frame[] frames = m_session.getFrames(); + Frame[] frames = m_session.getWorkerSession(m_activeIsolate).getFrames(); Frame ctx = frames[frameNum]; Location l = ctx.getLocation();