[nobug] remove method from uncommitted patch + fix potential NPE

2 files changed, 1 insertions, 4 deletions

diff --git a/bundles/org.eclipse.wst.jsdt.debug.core/src/org/eclipse/wst/jsdt/debug/internal/core/model/ScriptResolutionManager.java b/bundles/org.eclipse.wst.jsdt.debug.core/src/org/eclipse/wst/jsdt/debug/internal/core/model/ScriptResolutionManager.java
index 83a67ac..d3b87ce 100644
--- a/bundles/org.eclipse.wst.jsdt.debug.core/src/org/eclipse/wst/jsdt/debug/internal/core/model/ScriptResolutionManager.java
+++ b/bundles/org.eclipse.wst.jsdt.debug.core/src/org/eclipse/wst/jsdt/debug/internal/core/model/ScriptResolutionManager.java
@@ -145,7 +145,7 @@ public final class ScriptResolutionManager {
 		IPath p = SourceLookup.getSourcePath(script.sourceURI());
 		IResource res = ResourcesPlugin.getWorkspace().getRoot().findMember(p.makeAbsolute());
 		if(res == null) {
-			IProject pj =JavaScriptDebugPlugin.getExternalSourceProject(false);
+			IProject pj =JavaScriptDebugPlugin.getExternalSourceProject(true);
 			res = pj.findMember(p);
 		}
 		if(res != null && res.getType() == IResource.FILE) {
diff --git a/bundles/org.eclipse.wst.jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/jsdi/CFVirtualMachine.java b/bundles/org.eclipse.wst.jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/jsdi/CFVirtualMachine.java
index 71cd8c4..54ef13f 100644
--- a/bundles/org.eclipse.wst.jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/jsdi/CFVirtualMachine.java
+++ b/bundles/org.eclipse.wst.jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/jsdi/CFVirtualMachine.java
@@ -30,7 +30,6 @@ import org.eclipse.debug.core.IBreakpointListener;
 import org.eclipse.debug.core.IBreakpointManager;
 import org.eclipse.debug.core.model.IBreakpoint;
 import org.eclipse.wst.jsdt.core.JavaScriptCore;
-import org.eclipse.wst.jsdt.debug.core.breakpoints.IJavaScriptBreakpoint;
 import org.eclipse.wst.jsdt.debug.core.breakpoints.IJavaScriptLineBreakpoint;
 import org.eclipse.wst.jsdt.debug.core.jsdi.BooleanValue;
 import org.eclipse.wst.jsdt.debug.core.jsdi.NullValue;
@@ -810,8 +809,6 @@ public class CFVirtualMachine extends CFMirror implements VirtualMachine, IBreak
 		if (JavaScriptDebugModel.MODEL_ID.equals(breakpoint.getModelIdentifier())) {
 			if (breakpoint instanceof IJavaScriptLineBreakpoint) {
 				//TODO check handle map send request as needed
-				IJavaScriptBreakpoint jsbp = (IJavaScriptBreakpoint) breakpoint;
-				updateBreakpoint(jsbp);
 			}
 		}
 	}