Bug 277392 - [ui] Correcting typo in Work With combo doesn't bring up sitev20090521-1912

1 files changed, 19 insertions, 16 deletions

diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/ProvUI.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/ProvUI.java
index 35e0dfdf9..c7502af30 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/ProvUI.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/ProvUI.java
@@ -112,22 +112,25 @@ public class ProvUI {
 							};
 							int ret = dialog.open();
 							if (ret == Window.OK) {
-								ProvUI.startBatchOperation();
-								try {
-									RepositoryManipulator repoMan = repoManipulator;
-									if (repoManipulator == null)
-										repoMan = Policy.getDefault().getRepositoryManipulator();
-									ProvisioningOperation op = repoMan.getRemoveOperation(new URI[] {location});
-									op.execute(null);
-									ProvUI.endBatchOperation(false);
-									op = repoMan.getAddOperation(location);
-									op.execute(null);
-									String nickname = dialog.getName();
-									if (nickname != null && nickname.length() > 0)
-										ProvisioningUtil.setMetadataRepositoryProperty(location, IRepository.PROP_NICKNAME, nickname);
-								} catch (ProvisionException e) {
-									ProvUI.handleException(e, null, StatusManager.SHOW | StatusManager.LOG);
-									ProvUI.endBatchOperation(true);
+								URI correctedLocation = dialog.getLocation();
+								if (correctedLocation != null) {
+									ProvUI.startBatchOperation();
+									try {
+										RepositoryManipulator repoMan = repoManipulator;
+										if (repoManipulator == null)
+											repoMan = Policy.getDefault().getRepositoryManipulator();
+										ProvisioningOperation op = repoMan.getRemoveOperation(new URI[] {location});
+										op.execute(null);
+										ProvUI.endBatchOperation(false);
+										op = repoMan.getAddOperation(correctedLocation);
+										op.execute(null);
+										String nickname = dialog.getName();
+										if (nickname != null && nickname.length() > 0)
+											ProvisioningUtil.setMetadataRepositoryProperty(correctedLocation, IRepository.PROP_NICKNAME, nickname);
+									} catch (ProvisionException e) {
+										ProvUI.handleException(e, null, StatusManager.SHOW | StatusManager.LOG);
+										ProvUI.endBatchOperation(true);
+									}
 								}
 							}
 						}