flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ftho...@apache.org
Subject [22/56] [abbrv] git commit: [flex-sdk] [refs/heads/develop] - FLEX-34295: info breakpoints should now display the worker ID
Date Thu, 29 May 2014 16:03:04 GMT
FLEX-34295: info breakpoints should now display the worker ID

Fix: Prevent a NPE when BP has not been resolve yet


Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/828a0524
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/828a0524
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/828a0524

Branch: refs/heads/develop
Commit: 828a0524f504de375108d8a9c3eb2f809e58101c
Parents: 20011b7
Author: Fr�d�ric THMOAS <fthomas@apache.org>
Authored: Fri May 23 14:54:10 2014 +0100
Committer: Fr�d�ric THMOAS <fthomas@apache.org>
Committed: Fri May 23 14:54:10 2014 +0100

----------------------------------------------------------------------
 .../src/java/flex/tools/debugger/cli/DebugCLI.java      | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/828a0524/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 40ea85b..940f371 100644
--- a/modules/debugger/src/java/flex/tools/debugger/cli/DebugCLI.java
+++ b/modules/debugger/src/java/flex/tools/debugger/cli/DebugCLI.java
@@ -1808,11 +1808,13 @@ public class DebugCLI implements Runnable, SourceLocator {
                     sb.append(expr);
             }
 
-            Map<String, Object> workerArgs = new HashMap<String, Object>();
-            workerArgs.put("worker", l.getIsolateId() -1); //$NON-NLS-1$
-            sb.append(" (");
-            sb.append(getLocalizationManager().getLocalizedTextString("inWorker", workerArgs));
//$NON-NLS-1$
-            sb.append(") ");
+            if (l != null) {
+                Map<String, Object> workerArgs = new HashMap<String, Object>();
+                workerArgs.put("worker", l.getIsolateId() - 1); //$NON-NLS-1$
+                sb.append(" (");
+                sb.append(getLocalizationManager().getLocalizedTextString("inWorker", workerArgs));
//$NON-NLS-1$
+                sb.append(") ");
+            }
 
             switch (status) {
                 case BreakAction.UNRESOLVED:


Mime
View raw message