Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorqiwang2011-02-22 22:15:54 -0500
committerqiwang2011-02-22 22:15:54 -0500
commit19b50059a658c2e7a083cdcdc074ec71ca8cea19 (patch)
treeae75b3ddf4b5a5c0f19fe27333199d99dd75643e
parent4c9bf4f6388c8a4a2ece22e6deb0f5b5498a9dd9 (diff)
downloadorg.eclipse.pdt-19b50059a658c2e7a083cdcdc074ec71ca8cea19.tar.gz
org.eclipse.pdt-19b50059a658c2e7a083cdcdc074ec71ca8cea19.tar.xz
org.eclipse.pdt-19b50059a658c2e7a083cdcdc074ec71ca8cea19.zip
Removed the wrong assumption in the remove method
-rw-r--r--plugins/org.eclipse.php.server.core/src/org/eclipse/php/internal/server/core/manager/ServersManager.java17
1 files changed, 10 insertions, 7 deletions
diff --git a/plugins/org.eclipse.php.server.core/src/org/eclipse/php/internal/server/core/manager/ServersManager.java b/plugins/org.eclipse.php.server.core/src/org/eclipse/php/internal/server/core/manager/ServersManager.java
index d824634a1..d2035f218 100644
--- a/plugins/org.eclipse.php.server.core/src/org/eclipse/php/internal/server/core/manager/ServersManager.java
+++ b/plugins/org.eclipse.php.server.core/src/org/eclipse/php/internal/server/core/manager/ServersManager.java
@@ -21,7 +21,10 @@ import java.util.Iterator;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ProjectScope;
-import org.eclipse.core.runtime.*;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Preferences;
import org.eclipse.core.runtime.preferences.DefaultScope;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.core.runtime.preferences.IScopeContext;
@@ -154,12 +157,12 @@ public class ServersManager implements PropertyChangeListener, IAdaptable {
ServersManager manager = ServersManager.getInstance();
Server removedServer = (Server) manager.servers.remove(serverName);
Server workspaceDefault = getDefaultServer(null);
- if (workspaceDefault == null) {
- // Should not happen
- Logger.log(IStatus.ERROR,
- "There is no defined default server for the workspace.");
- return null;
- }
+ // if (workspaceDefault == null) {
+ // // Should not happen
+ // Logger.log(IStatus.ERROR,
+ // "There is no defined default server for the workspace.");
+ // return null;
+ // }
if (removedServer == null) {
// if the name is not existing, just quit.
return null;

Back to the top