aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJacek Pospychala2013-01-07 02:10:56 (EST)
committerJacek Pospychala2013-01-07 02:10:56 (EST)
commitec5b6847d09f5f06aaf163d0edec73ec3ee48597 (patch)
tree76c67912a2744cb4af905146877dfc81e3c3f5a0
parent6528249ea3ae3368d6349aa621079289787eb16b (diff)
downloadorg.eclipse.pdt-ec5b6847d09f5f06aaf163d0edec73ec3ee48597.zip
org.eclipse.pdt-ec5b6847d09f5f06aaf163d0edec73ec3ee48597.tar.gz
org.eclipse.pdt-ec5b6847d09f5f06aaf163d0edec73ec3ee48597.tar.bz2
Bug 397529 - Possible NPE in RemoteDebugger
-rw-r--r--plugins/org.eclipse.php.debug.core/src/org/eclipse/php/internal/debug/core/zend/debugger/RemoteDebugger.java17
1 files changed, 9 insertions, 8 deletions
diff --git a/plugins/org.eclipse.php.debug.core/src/org/eclipse/php/internal/debug/core/zend/debugger/RemoteDebugger.java b/plugins/org.eclipse.php.debug.core/src/org/eclipse/php/internal/debug/core/zend/debugger/RemoteDebugger.java
index a8392c9..3ae5fe5 100644
--- a/plugins/org.eclipse.php.debug.core/src/org/eclipse/php/internal/debug/core/zend/debugger/RemoteDebugger.java
+++ b/plugins/org.eclipse.php.debug.core/src/org/eclipse/php/internal/debug/core/zend/debugger/RemoteDebugger.java
@@ -326,8 +326,8 @@ public class RemoteDebugger implements IRemoteDebugger {
.getRoot()
.getFile(
project.getFullPath()
- .append(
- location.removeFirstSegments(segmentsToRemove)));
+ .append(location
+ .removeFirstSegments(segmentsToRemove)));
break;
}
}
@@ -384,8 +384,8 @@ public class RemoteDebugger implements IRemoteDebugger {
// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=306834
if (path.segmentCount() >= 2) {
- IFile wsFile = ResourcesPlugin.getWorkspace().getRoot().getFile(
- path);
+ IFile wsFile = ResourcesPlugin.getWorkspace().getRoot()
+ .getFile(path);
if (debugTarget.isPHPCGI() && wsFile.exists()
&& wsFile.getLocation() != null) {
File fsFile = wsFile.getLocation().toFile();
@@ -813,8 +813,8 @@ public class RemoteDebugger implements IRemoteDebugger {
public static void warnOlderDebugVersion() {
boolean dontShowWarning = PHPDebugPlugin.getDefault()
- .getPluginPreferences().getBoolean(
- "DontShowOlderDebuggerWarning"); //$NON-NLS-1$
+ .getPluginPreferences()
+ .getBoolean("DontShowOlderDebuggerWarning"); //$NON-NLS-1$
if (!dontShowWarning) {
Display.getDefault().asyncExec(new Runnable() {
public void run() {
@@ -1121,8 +1121,8 @@ public class RemoteDebugger implements IRemoteDebugger {
if (layer.getCalledFileName() != null
&& currentWorkingDir != null && project != null) {
- Result<?, ?> result = PHPSearchEngine.find(layer
- .getCalledFileName(), currentWorkingDir,
+ Result<?, ?> result = PHPSearchEngine.find(
+ layer.getCalledFileName(), currentWorkingDir,
previousScriptDir, project);
if (result instanceof ResourceResult) {
layer.setResolvedCalledFileName(((ResourceResult) result)
@@ -1218,6 +1218,7 @@ public class RemoteDebugger implements IRemoteDebugger {
if (includePaths.size() > 0) {
return checkIncludePaths(remoteFile, includePaths);
}
+ break;
}
}
}