From 2b0f7dadf45a5e7dd65529f161de3ff8f47b9898 Mon Sep 17 00:00:00 2001
From: Michael Valenta
Date: Thu, 22 Apr 2004 19:34:49 +0000
Subject: 59401: Very slow startup

---
 .../org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java | 10 ----------
 .../src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java     | 10 ----------
 .../src/org/eclipse/team/internal/ui/TeamUIPlugin.java         | 10 ----------
 3 files changed, 30 deletions(-)

diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java
index 5a64dd318..ee3a65fde 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java
@@ -165,16 +165,6 @@ public class CVSProviderPlugin extends Plugin {
 	 * @return the plugin instance
 	 */
 	public static CVSProviderPlugin getPlugin() {
-		// If the instance has not been initialized, we will wait.
-		// This can occur if multiple threads try to load the plugin at the same
-		// time (see bug 33825: http://bugs.eclipse.org/bugs/show_bug.cgi?id=33825)
-		while (instance == null) {
-			try {
-				Thread.sleep(50);
-			} catch (InterruptedException e) {
-				// ignore and keep trying
-			}
-		}
 		return instance;
 	}
 	
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java
index 65f5ded89..955b0acbb 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java
@@ -327,16 +327,6 @@ public class CVSUIPlugin extends AbstractUIPlugin {
 	 * @return the plugin instance
 	 */
 	public static CVSUIPlugin getPlugin() {
-		// If the instance has not been initialized, we will wait.
-		// This can occur if multiple threads try to load the plugin at the same
-		// time (see bug 33825: http://bugs.eclipse.org/bugs/show_bug.cgi?id=33825)
-		while (plugin == null) {
-			try {
-				Thread.sleep(50);
-			} catch (InterruptedException e) {
-				// ignore and keep trying
-			}
-		}
 		return plugin;
 	}
 	
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java
index 7e29a3cf0..9ddd46307 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java
@@ -121,16 +121,6 @@ public class TeamUIPlugin extends AbstractUIPlugin {
 	 * @return the singleton plugin instance
 	 */
 	public static TeamUIPlugin getPlugin() {
-		// If the instance has not been initialized, we will wait.
-		// This can occur if multiple threads try to load the plugin at the same
-		// time (see bug 33825: http://bugs.eclipse.org/bugs/show_bug.cgi?id=33825)
-		while (instance == null) {
-			try {
-				Thread.sleep(50);
-			} catch (InterruptedException e) {
-				// ignore and keep trying
-			}
-		}
 		return instance;
 	}
 	/**
-- 
cgit v1.2.3