Bug 212348 [prov] [repo] Find a way to better report the failure of repository addition

1 files changed, 17 insertions, 9 deletions

diff --git a/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/ProvisioningHelper.java b/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/ProvisioningHelper.java
index 47d13b75f..43f5f76d7 100644
--- a/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/ProvisioningHelper.java
+++ b/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/ProvisioningHelper.java
@@ -36,23 +36,31 @@ public class ProvisioningHelper {
 	public static IMetadataRepository addMetadataRepository(URL location) {
 		IMetadataRepositoryManager manager = (IMetadataRepositoryManager) ServiceHelper.getService(Activator.getContext(), IMetadataRepositoryManager.class.getName());
 		if (manager == null)
-			throw new IllegalStateException("No metadata repository manager found");
-		IMetadataRepository repository = manager.loadRepository(location, null);
-		if (repository != null)
-			return repository;
+			throw new IllegalStateException("No metadata repository manager found"); //$NON-NLS-1$
+		try {
+			return manager.loadRepository(location, null);
+		} catch (ProvisionException e) {
+			//fall through and create a new repository
+		}
 
-		// for convenience create and add a repo here
-		// TODO need to get rid o fthe factory method.
+		// for convenience create and add a repository here
 		String repositoryName = location + " - metadata"; //$NON-NLS-1$
-		IMetadataRepository result = manager.createRepository(location, repositoryName, IMetadataRepositoryManager.TYPE_SIMPLE_REPOSITORY);
-		return result;
+		try {
+			return manager.createRepository(location, repositoryName, IMetadataRepositoryManager.TYPE_SIMPLE_REPOSITORY);
+		} catch (ProvisionException e) {
+			return null;
+		}
 	}
 
 	public static IMetadataRepository getMetadataRepository(URL location) {
 		IMetadataRepositoryManager manager = (IMetadataRepositoryManager) ServiceHelper.getService(Activator.getContext(), IMetadataRepositoryManager.class.getName());
 		if (manager == null)
 			throw new IllegalStateException("No metadata repository manager found");
-		return manager.loadRepository(location, null);
+		try {
+			return manager.loadRepository(location, null);
+		} catch (ProvisionException e) {
+			return null;
+		}
 	}
 
 	public static void removeMetadataRepository(URL location) {