aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwgalanciak2014-01-29 04:46:51 (EST)
committerwgalanciak2014-01-29 04:46:51 (EST)
commitd6b90698f14caed79772fa06b1f5e5bdf8e3c942 (patch)
treea1a72fe3f983821c921625281078f4ba6907328e
parent961c058e49707a9e47ec43112a4230c29d7ef5d8 (diff)
downloadorg.eclipse.pdt-d6b90698f14caed79772fa06b1f5e5bdf8e3c942.zip
org.eclipse.pdt-d6b90698f14caed79772fa06b1f5e5bdf8e3c942.tar.gz
org.eclipse.pdt-d6b90698f14caed79772fa06b1f5e5bdf8e3c942.tar.bz2
Bug 402829 - PHP Script arguments not passed to scriptrefs/changes/33/21233/1
Change-Id: I16a5e0541b0801aaa56cdf7e346ba0f31ed357df Signed-off-by: wgalanciak <wojciech.galanciak@gmail.com>
-rw-r--r--plugins/org.eclipse.php.debug.core/src/org/eclipse/php/internal/debug/core/launching/PHPExecutableLaunchDelegate.java8
-rw-r--r--plugins/org.eclipse.php.debug.core/src/org/eclipse/php/internal/debug/core/launching/XDebugExeLaunchConfigurationDelegate.java2
2 files changed, 5 insertions, 5 deletions
diff --git a/plugins/org.eclipse.php.debug.core/src/org/eclipse/php/internal/debug/core/launching/PHPExecutableLaunchDelegate.java b/plugins/org.eclipse.php.debug.core/src/org/eclipse/php/internal/debug/core/launching/PHPExecutableLaunchDelegate.java
index d50db51..5f98a29 100644
--- a/plugins/org.eclipse.php.debug.core/src/org/eclipse/php/internal/debug/core/launching/PHPExecutableLaunchDelegate.java
+++ b/plugins/org.eclipse.php.debug.core/src/org/eclipse/php/internal/debug/core/launching/PHPExecutableLaunchDelegate.java
@@ -249,10 +249,10 @@ public class PHPExecutableLaunchDelegate extends LaunchConfigurationDelegate {
String[] args = PHPLaunchUtilities.getProgramArguments(launch
.getLaunchConfiguration());
- String[] cmdLine = PHPLaunchUtilities.getCommandLine(launch
- .getLaunchConfiguration(), phpExeString, phpConfigDir,
- fileName, sapiType == PHPexeItem.SAPI_CLI ? args : null,
- phpV);
+ String[] cmdLine = PHPLaunchUtilities.getCommandLine(
+ launch.getLaunchConfiguration(), phpExeString,
+ phpConfigDir, fileName,
+ PHPexeItem.SAPI_CLI.equals(sapiType) ? args : null, phpV);
// Set library search path:
String libPath = PHPLaunchUtilities
diff --git a/plugins/org.eclipse.php.debug.core/src/org/eclipse/php/internal/debug/core/launching/XDebugExeLaunchConfigurationDelegate.java b/plugins/org.eclipse.php.debug.core/src/org/eclipse/php/internal/debug/core/launching/XDebugExeLaunchConfigurationDelegate.java
index dc578f9..a0da7cf 100644
--- a/plugins/org.eclipse.php.debug.core/src/org/eclipse/php/internal/debug/core/launching/XDebugExeLaunchConfigurationDelegate.java
+++ b/plugins/org.eclipse.php.debug.core/src/org/eclipse/php/internal/debug/core/launching/XDebugExeLaunchConfigurationDelegate.java
@@ -232,7 +232,7 @@ public class XDebugExeLaunchConfigurationDelegate extends
}
}
String[] args = null;
- if (sapiType == PHPexeItem.SAPI_CLI) {
+ if (PHPexeItem.SAPI_CLI.equals(sapiType)) {
args = PHPLaunchUtilities.getProgramArguments(launch
.getLaunchConfiguration());
}