Attachment 57955 Details for Bug 172382 – Patch to ServerCore

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch to ServerCore

172382.patch (text/plain), 2.60 KB, created by Tim deBoer

on 2007-01-31 18:33:58 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Tim deBoer

Created: 2007-01-31 18:33:58 EST

Size: 2.60 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.wst.server.core
>Index: servercore/org/eclipse/wst/server/core/ServerCore.java
>===================================================================
>RCS file: /cvsroot/webtools/wst/components/server/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/ServerCore.java,v
>retrieving revision 1.29
>diff -u -r1.29 ServerCore.java
>--- servercore/org/eclipse/wst/server/core/ServerCore.java	22 Apr 2006 22:06:48 -0000	1.29
>+++ servercore/org/eclipse/wst/server/core/ServerCore.java	31 Jan 2007 02:16:58 -0000
>@@ -41,9 +41,7 @@
> 
> 	private static IRegistryChangeListener registryListener;
> 
>-	static {
>-		executeStartups();
>-	}
>+	private static boolean initialized = false;
> 
> 	private static class RegistryChangeListener implements IRegistryChangeListener {
> 		public void registryChanged(IRegistryChangeEvent event) {
>@@ -238,6 +236,14 @@
> 		Trace.trace(Trace.EXTENSION_POINT, "-<- Done loading .startup extension point -<-");
> 	}
> 
>+	private static synchronized void initialize() {
>+		if (initialized)
>+			return;
>+		
>+		initialized = true;
>+		executeStartups();
>+	}
>+
> 	/**
> 	 * Load the runtime types.
> 	 */
>@@ -314,6 +320,8 @@
> 	 * with the given id
> 	 */
> 	public static IRuntime findRuntime(String id) {
>+		if (!initialized)
>+			initialize();
> 		return getResourceManager().getRuntime(id);
> 	}
> 
>@@ -327,6 +335,8 @@
> 	 * @return a possibly-empty array of runtime instances {@link IRuntime}
> 	 */
> 	public static IRuntime[] getRuntimes() {
>+		if (!initialized)
>+			initialize();
> 		return getResourceManager().getRuntimes();
> 	}
> 
>@@ -341,6 +351,8 @@
> 	 * with the given id
> 	 */
> 	public static IServer findServer(String id) {
>+		if (!initialized)
>+			initialize();
> 		return getResourceManager().getServer(id);
> 	}
> 
>@@ -354,6 +366,8 @@
> 	 * @return a possibly-empty array of server instances {@link IServer}
> 	 */
> 	public static IServer[] getServers() {
>+		if (!initialized)
>+			initialize();
> 		return getResourceManager().getServers();
> 	}
> 
>@@ -412,6 +426,8 @@
> 	 *    default server
> 	 */
> 	public static IServer getDefaultServer(IModule module) {
>+		if (!initialized)
>+			initialize();
> 		return ModuleProperties.getInstance().getDefaultServer(module);
> 	}
> 
>@@ -428,6 +444,8 @@
> 	 * @throws CoreException if there is a problem setting the default server
> 	 */
> 	public static void setDefaultServer(IModule module, IServer server, IProgressMonitor monitor) throws CoreException {
>+		if (!initialized)
>+			initialize();
> 		ModuleProperties.getInstance().setDefaultServer(module, server, monitor);
> 	}
>

Actions: View | Diff

Attachments on bug 172382: 57955