flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [42/50] [abbrv] git commit: [flex-falcon] [refs/heads/develop] - re-apply 828a0524f504de375108d8a9c3eb2f809e58101c from Flex SDK
Date Tue, 02 Jun 2015 17:05:45 GMT
re-apply 828a0524f504de375108d8a9c3eb2f809e58101c from Flex SDK


Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/278501b2
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/278501b2
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/278501b2

Branch: refs/heads/develop
Commit: 278501b26652f47e577fa4de01a64e87d8298195
Parents: 9a5caec
Author: Alex Harui <aharui@apache.org>
Authored: Mon Jun 1 17:05:26 2015 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Mon Jun 1 17:05:26 2015 -0700

----------------------------------------------------------------------
 debugger/src/flex/tools/debugger/cli/DebugCLI.java | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/278501b2/debugger/src/flex/tools/debugger/cli/DebugCLI.java
----------------------------------------------------------------------
diff --git a/debugger/src/flex/tools/debugger/cli/DebugCLI.java b/debugger/src/flex/tools/debugger/cli/DebugCLI.java
index 6e2997b..f36ad77 100644
--- a/debugger/src/flex/tools/debugger/cli/DebugCLI.java
+++ b/debugger/src/flex/tools/debugger/cli/DebugCLI.java
@@ -2039,12 +2039,14 @@ 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