33825: Eclipse startup failedI20030319a

1 files changed, 10 insertions, 0 deletions

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 cc9f80a6c..27d56042a 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
@@ -300,6 +300,16 @@ public class CVSUIPlugin extends AbstractUIPlugin implements IPropertyChangeList
 	 * @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;
 	}