Repository: flex-sdk Updated Branches: refs/heads/FDBWorkers 9253807b5 -> 20011b7a7
FLEX-34297: FDB set a breakpoint in the wrong file when asked to be set for a file existing in another Worker Forgot to check that works from main worker too :P (fixed) Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/20011b7a Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/20011b7a Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/20011b7a Branch: refs/heads/FDBWorkers Commit: 20011b7a70a17e80a8e2652fb88eeb2f12b6b5b1 Parents: 9253807 Author: Fr�d�ric THMOAS <[email protected]> Authored: Fri May 23 12:33:27 2014 +0100 Committer: Fr�d�ric THMOAS <[email protected]> Committed: Fri May 23 12:33:27 2014 +0100 ---------------------------------------------------------------------- .../src/java/flex/tools/debugger/cli/FileInfoCache.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/20011b7a/modules/debugger/src/java/flex/tools/debugger/cli/FileInfoCache.java ---------------------------------------------------------------------- diff --git a/modules/debugger/src/java/flex/tools/debugger/cli/FileInfoCache.java b/modules/debugger/src/java/flex/tools/debugger/cli/FileInfoCache.java index d66bc85..f4587b7 100644 --- a/modules/debugger/src/java/flex/tools/debugger/cli/FileInfoCache.java +++ b/modules/debugger/src/java/flex/tools/debugger/cli/FileInfoCache.java @@ -91,8 +91,10 @@ public class FileInfoCache implements Comparator<SourceFile> public SourceFile[] getFileList(int isolateId) { populate(); - if (isolateId == Isolate.DEFAULT_ID) - return m_files; + if (isolateId == Isolate.DEFAULT_ID) { + final Object[] valuesToArray = m_byInt.valuesToArray(new Object[m_byInt.size()]); + return Arrays.copyOf(valuesToArray, valuesToArray.length, SourceFile[].class); + } else if (isolateId != lastActiveIsolate) { buildIsolateFiles(isolateId); } @@ -302,7 +304,7 @@ public class FileInfoCache implements Comparator<SourceFile> { int i = s.getId(); if (isolateId == Isolate.DEFAULT_ID) - m_byInt.put(i, s); + m_byInt.put(i, s); else getIsolateState(isolateId).put(i, s); }
