Attachment 97623 Details for Bug 228297 – Fix for race condition

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

[patch] Fix for race condition

228297RaceCondition.patch (text/plain), 3.92 KB, created by Curtis Windatt

on 2008-04-25 11:17:22 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Curtis Windatt

Created: 2008-04-25 11:17:22 EDT

Size: 3.92 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.pde.core
>Index: src/org/eclipse/pde/internal/core/JavadocLocationManager.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/JavadocLocationManager.java,v
>retrieving revision 1.16
>diff -u -r1.16 JavadocLocationManager.java
>--- src/org/eclipse/pde/internal/core/JavadocLocationManager.java	2 Jan 2008 15:56:17 -0000	1.16
>+++ src/org/eclipse/pde/internal/core/JavadocLocationManager.java	25 Apr 2008 15:14:31 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -13,15 +13,8 @@
> import java.io.File;
> import java.net.MalformedURLException;
> import java.net.URL;
>-import java.util.HashMap;
>-import java.util.HashSet;
>-import java.util.Iterator;
>-import java.util.Set;
>-
>-import org.eclipse.core.runtime.IConfigurationElement;
>-import org.eclipse.core.runtime.IExtension;
>-import org.eclipse.core.runtime.IPath;
>-import org.eclipse.core.runtime.Path;
>+import java.util.*;
>+import org.eclipse.core.runtime.*;
> import org.eclipse.osgi.service.resolver.BundleDescription;
> import org.eclipse.osgi.service.resolver.HostSpecification;
> import org.eclipse.pde.core.plugin.IPluginModelBase;
>@@ -112,7 +105,7 @@
> 					buffer.append(path);
> 					if (archive)
> 						buffer.insert(0, "jar:"); //$NON-NLS-1$
>-					processPlugins(buffer.toString(), children[i].getChildren()); //$NON-NLS-1$				
>+					processPlugins(buffer.toString(), children[i].getChildren());
> 				}
> 			}
> 		}
>@@ -134,7 +127,7 @@
> 		}
> 	}
> 
>-	public void reset() {
>+	public synchronized void reset() {
> 		fLocations = null;
> 	}
> 
>#P org.eclipse.pde.ui
>Index: src/org/eclipse/pde/internal/ui/preferences/TargetSourceTab.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/TargetSourceTab.java,v
>retrieving revision 1.15
>diff -u -r1.15 TargetSourceTab.java
>--- src/org/eclipse/pde/internal/ui/preferences/TargetSourceTab.java	16 Jan 2008 17:08:15 -0000	1.15
>+++ src/org/eclipse/pde/internal/ui/preferences/TargetSourceTab.java	25 Apr 2008 15:14:33 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -14,6 +14,7 @@
> import java.util.*;
> import java.util.List;
> import org.eclipse.core.runtime.*;
>+import org.eclipse.core.runtime.jobs.Job;
> import org.eclipse.core.runtime.spi.RegistryContributor;
> import org.eclipse.jface.dialogs.Dialog;
> import org.eclipse.jface.dialogs.IDialogPage;
>@@ -162,7 +163,15 @@
> 	public boolean performOk() {
> 		Preferences preferences = PDECore.getDefault().getPluginPreferences();
> 		preferences.setValue(ICoreConstants.P_SOURCE_LOCATIONS, encodeSourceLocations());
>-		PDECore.getDefault().getJavadocLocationManager().reset();
>+		// Reset the javadoc locations in a job in case locations are being initialized
>+		Job resetJavadocJob = new Job("Reset Javadoc Locations") { //$NON-NLS-1$
>+			protected IStatus run(IProgressMonitor monitor) {
>+				PDECore.getDefault().getJavadocLocationManager().reset();
>+				return Status.OK_STATUS;
>+			}
>+		};
>+		resetJavadocJob.setSystem(true);
>+		resetJavadocJob.schedule();
> 		return true;
> 	}
>

Actions: View | Diff

Attachments on bug 228297: 97623 | 97703