flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [39/50] [abbrv] git commit: [flex-falcon] [refs/heads/develop] - re-apply 85d2f5eac9c3b62224550c8712f7965d89233119 from Flex SDK
Date Tue, 02 Jun 2015 17:05:42 GMT
re-apply 85d2f5eac9c3b62224550c8712f7965d89233119 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/53e6e130
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/53e6e130
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/53e6e130

Branch: refs/heads/develop
Commit: 53e6e13013eef8105b45f043b66e1281eb7333a4
Parents: 6ad4517
Author: Alex Harui <aharui@apache.org>
Authored: Mon Jun 1 16:55:29 2015 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Mon Jun 1 16:55:29 2015 -0700

----------------------------------------------------------------------
 .../flex/tools/debugger/cli/BreakAction.java    |  6 ++--
 .../src/flex/tools/debugger/cli/DebugCLI.java   | 37 ++++++++------------
 2 files changed, 17 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/53e6e130/debugger/src/flex/tools/debugger/cli/BreakAction.java
----------------------------------------------------------------------
diff --git a/debugger/src/flex/tools/debugger/cli/BreakAction.java b/debugger/src/flex/tools/debugger/cli/BreakAction.java
index d3829e2..aa2a78b 100644
--- a/debugger/src/flex/tools/debugger/cli/BreakAction.java
+++ b/debugger/src/flex/tools/debugger/cli/BreakAction.java
@@ -129,8 +129,8 @@ public class BreakAction
 	/*
 	 * Check to see if our location matches the requested one
 	 */
-	public boolean locationMatches(int fileId, int line)
-	{
+    public boolean locationMatches(int fileId, int line, int isolateId)
+    {
 		boolean match = false;
 		LocationCollection col = getLocations();
 		if (col != null)
@@ -141,7 +141,7 @@ public class BreakAction
 			while(!match && itr.hasNext())
 			{
 				Location l = (Location)itr.next();
-				if (l != null && l.getFile().getId() == fileId && l.getLine() == line)
+                if (l != null && l.getFile().getId() == fileId && l.getLine()
== line && l.getIsolateId() == isolateId)
 					match = true;
 			}
 		}

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/53e6e130/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 44a7d4d..52453fb 100644
--- a/debugger/src/flex/tools/debugger/cli/DebugCLI.java
+++ b/debugger/src/flex/tools/debugger/cli/DebugCLI.java
@@ -3365,12 +3365,13 @@ public class DebugCLI implements Runnable, SourceLocator
 	{
 		BreakAction a = breakpointAt(at);
 //		if (isolateId == Isolate.DEFAULT_ID)
-			m_breakpoints.removeElementAt(at);
 //		else
 //			getIsolateState(isolateId).m_breakpoints.removeElementAt(at);
 		
-		if (a.getStatus() == BreakAction.RESOLVED)
+		if (a.getStatus() == BreakAction.RESOLVED) {
 			breakDisableRequest(a.getLocations());
+			m_breakpoints.removeElementAt(at);
+		}
 		return a;
 	}
 
@@ -3690,24 +3691,15 @@ public class DebugCLI implements Runnable, SourceLocator
 		    at = breakpointIndexOf(l, at);
 			if (at > -1)
 			{
-				if (breakpointAt(at).isEnabled())
+				if (breakpointAt(at).isEnabled()) {
 					hit = true;
-				else
-					at++; // our location match is not enabled but let's continue after the hit
-			}
-		}
-		while(at > -1 && !hit);
-
-		// no one matches, so let's remove it at the session level
-		if (!hit)
-		{
-			Iterator<Location> itr = col.iterator();
-			while(itr.hasNext())
-			{
-				l = itr.next();
-				try { m_session.clearBreakpoint(l); } catch(NoResponseException nre) {}
+					try { m_session.clearBreakpoint(l); } catch(NoResponseException nre) {}
+				}
+                else
+                    at++; // our location match is not enabled but let's continue after the
hit
 			}
 		}
+		while (at > -1 && !hit);
 	}
 
 	BreakAction breakpointAt(int at) {
@@ -3755,8 +3747,8 @@ public class DebugCLI implements Runnable, SourceLocator
 		for(int i=start; (hit<0) && (i<size) ; i++)
 		{
 			BreakAction b = breakpointAt(i);
-			if (b.locationMatches(fileId, line) && (includeDisabled || b.isEnabled()) )
-				hit = i;
+            if (b.locationMatches(fileId, line, m_activeIsolate) && (includeDisabled
|| b.isEnabled()))
+            	hit = i;
 		}
 		return hit;
 	}
@@ -3770,8 +3762,8 @@ public class DebugCLI implements Runnable, SourceLocator
 		for(int i=0; (hit<0) && (i<size) ; i++)
 		{
 			BreakAction b = breakpointAt(i);
-			if (b.getId() == id)
-				hit = i;
+            if (b.getId() == id && b.getLocation().getIsolateId() == m_activeIsolate)
+            	hit = i;
 		}
 		return hit;
 	}
@@ -6440,8 +6432,7 @@ public class DebugCLI implements Runnable, SourceLocator
 		for(int i=0; i<count; i++)
 		{
 			BreakAction a = breakpointAt(i);
-			if (a.locationMatches(fileId, line))
-			{
+            if (a.locationMatches(fileId, line, isolateId)) {
 				/**
 				 * Note that it appears that we stopped due to hitting a hard breakpoint
 				 * Now if the breakpoint is conditional it may eval to false, meaning we


Mime
View raw message