| commit | 4d6a9cdcb35d5f0b4a7c4d50b0058d58a177d1ad | [log] [tgz] |
|---|---|---|
| author | Frédéric THMOAS <fthomas@apache.org> | Thu May 29 15:40:47 2014 +0100 |
| committer | Frédéric THMOAS <fthomas@apache.org> | Thu May 29 15:40:47 2014 +0100 |
| tree | 91615a419fd127e98c99ffa3a0a9c009f430e786 | |
| parent | 71a01cc4687cf618283286b8168693fe9414d216 [diff] | |
| parent | b862ea94d664c52ddc671bc1c12ee8740614e266 [diff] |
Merge remote-tracking branch 'origin/FDBWorkers' into FDBWorkers
diff --git a/modules/debugger/src/java/flash/tools/debugger/concrete/DManager.java b/modules/debugger/src/java/flash/tools/debugger/concrete/DManager.java index a8b1c8a..5f8c700 100644 --- a/modules/debugger/src/java/flash/tools/debugger/concrete/DManager.java +++ b/modules/debugger/src/java/flash/tools/debugger/concrete/DManager.java
@@ -735,9 +735,9 @@ void addBreakpoint(int id, DLocation l, int isolateId) { ArrayList<DLocation> breakpoints = getIsolateState(isolateId).m_breakpoints; synchronized (breakpoints) { - breakpoints.add(l); + breakpoints.add(l); + } } - } public DLocation[] getBreakpoints(int isolateId) { ArrayList<DLocation> breakpoints = getIsolateState(isolateId).m_breakpoints;
diff --git a/modules/debugger/src/java/flash/tools/debugger/concrete/PlayerSession.java b/modules/debugger/src/java/flash/tools/debugger/concrete/PlayerSession.java index 5d25b83..3e77039 100644 --- a/modules/debugger/src/java/flash/tools/debugger/concrete/PlayerSession.java +++ b/modules/debugger/src/java/flash/tools/debugger/concrete/PlayerSession.java
@@ -913,7 +913,7 @@ int isolateId = local.getIsolateId(); Location l = null; l = m_manager.getBreakpoint(bp, isolateId); - + if (l != null) { /* send the message */