commit 567d1845ed0a562ee03e81325d3c9054b1f106a7
author Pascal Rapicault <prapicau> Thu May 20 19:47:20 2004 +0000
committer Pascal Rapicault <prapicau> Thu May 20 19:47:20 2004 +0000
tree bfaf3f127655bd7372a6ee111850783f46fb506d
parent 47b98401e11318a1053a25d4498859d37e24e46b

Bug 62185
	  	[RCP] Workspace chooser fails if workspace is in use

bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/BasicLocation.java

diff --git a/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/BasicLocation.java b/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/BasicLocation.java
index 63ec5b1..66cda52 100644
--- a/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/BasicLocation.java
+++ b/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/BasicLocation.java
@@ -151,7 +151,14 @@
 		setLocker(lock);
 		if (locker == null)
 			return true;
-		return locker.lock();
+		boolean locked = false; 
+		try {
+			locked = locker.lock();
+			return locked;
+		} finally {
+			if (!locked)
+				locker = null;
+		}
 	}
 
 	private void setLocker(File lock) {