| commit | 98f3c1f0a8e431581495d47579ae050d88a265de | [log] [tgz] |
|---|---|---|
| author | deboer <deboer> | Wed Jul 13 18:08:39 2005 +0000 |
| committer | deboer <deboer> | Wed Jul 13 18:08:39 2005 +0000 |
| tree | f1b37af11546c51aed63ec897d54f3fed7386d1f | |
| parent | fee6a80a5a8e46fb4e188da645428a54039e6fd6 [diff] |
[103693] Fix JUnit tests
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatServerBehaviour.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatServerBehaviour.java index 3501af6..42ef3f6 100644 --- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatServerBehaviour.java +++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatServerBehaviour.java
@@ -522,7 +522,7 @@ workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, mergeArguments(existingProgArgs, getRuntimeProgramArguments(true))); String existingVMArgs = workingCopy.getAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, (String)null); - if (!getTomcatServer().isSecure()) { + if (existingVMArgs != null && !getTomcatServer().isSecure()) { // remove -Djava.security.manager and -Djava.security.policy="x x" int index = existingVMArgs.indexOf("-Djava.security.manager"); if (index >= 0) {