From d90fd2eb0897ea70336f57ae4c4cf1214857866e Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Thu, 25 Aug 2011 19:56:53 +0200 Subject: [PATCH] show installed plugins without internet connection, see #44 --- .../main/java/sonia/scm/plugin/AetherPluginHandler.java | 1 - .../main/java/sonia/scm/plugin/DefaultPluginManager.java | 7 ++++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/AetherPluginHandler.java b/scm-webapp/src/main/java/sonia/scm/plugin/AetherPluginHandler.java index 0cebfb87ec..def0bc3f8c 100644 --- a/scm-webapp/src/main/java/sonia/scm/plugin/AetherPluginHandler.java +++ b/scm-webapp/src/main/java/sonia/scm/plugin/AetherPluginHandler.java @@ -58,7 +58,6 @@ import org.sonatype.aether.impl.VersionResolver; import org.sonatype.aether.impl.internal.DefaultServiceLocator; import org.sonatype.aether.repository.LocalRepository; import org.sonatype.aether.repository.Proxy; -import org.sonatype.aether.repository.ProxySelector; import org.sonatype.aether.repository.RemoteRepository; import org.sonatype.aether.resolution.DependencyRequest; import org.sonatype.aether.spi.connector.RepositoryConnectorFactory; diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginManager.java b/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginManager.java index 1abf3d4f43..2915c73d75 100644 --- a/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginManager.java +++ b/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginManager.java @@ -558,13 +558,18 @@ public class DefaultPluginManager implements PluginManager } catch (Exception ex) { - throw new PluginLoadException(ex); + logger.error("could not load plugins from plugin center", ex); } finally { IOUtil.close(input); } } + + if (center == null) + { + center = new PluginCenter(); + } } }