Fix for bug 134483

1 files changed, 8 insertions, 4 deletions

diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerFactory.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerFactory.java
index 9cb96dbb2..9bf3b716d 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerFactory.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerFactory.java
@@ -52,10 +52,14 @@ public class ContainerFactory implements IContainerFactory {
 	}
 
 	protected ContainerFactory() {
-		ECFPlugin.getDefault().addDisposable(new IDisposable() {
-			public void dispose() {
-				doDispose();
-			}});
+		try {
+			ECFPlugin.getDefault().addDisposable(new IDisposable() {
+				public void dispose() {
+					doDispose();
+				}});
+		} catch (Exception e) {
+			System.err.println("WARNING:  Exception accessing ECFPlugin within ContainerFactory initialization.  May not be running as OSGI bundle");
+		}
 	}
 
 	public static IContainerFactory getDefault() {