summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-02-25 05:12:15 (EST)
committerEike Stepper2007-02-25 05:12:15 (EST)
commit85fffaaa9c2b25243b6d9f7f5934b1247b591b97 (patch)
tree8ce86a571c4dd04f0e03b9e0fe788beabc8e71c4
parentf655d6c59113e033af6c1eddc5a4b0b4dd30c7df (diff)
downloadcdo-85fffaaa9c2b25243b6d9f7f5934b1247b591b97.zip
cdo-85fffaaa9c2b25243b6d9f7f5934b1247b591b97.tar.gz
cdo-85fffaaa9c2b25243b6d9f7f5934b1247b591b97.tar.bz2
*** empty log message ***
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOSessionsView.java11
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/om/OSGiActivator.java10
2 files changed, 19 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOSessionsView.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOSessionsView.java
index eba1c8e..279d6d6 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOSessionsView.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOSessionsView.java
@@ -2,9 +2,11 @@ package org.eclipse.emf.cdo.internal.ui.views;
import org.eclipse.emf.cdo.CDOConstants;
import org.eclipse.emf.cdo.container.CDOContainerAdapter;
+import org.eclipse.emf.cdo.internal.ui.bundle.CDOUI;
import org.eclipse.net4j.container.Container;
import org.eclipse.net4j.container.ContainerManager;
+import org.eclipse.net4j.transport.ConnectorException;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IAction;
@@ -196,9 +198,14 @@ public class CDOSessionsView extends ViewPart
if (dialog.open() == InputDialog.OK)
{
String description = dialog.getValue();
- Object object = CDO_ADAPTER.getSession(description);
- if (object == null)
+
+ try
+ {
+ CDO_ADAPTER.getSession(description);
+ }
+ catch (ConnectorException ex)
{
+ CDOUI.LOG.error(ex);
showMessage("Error while creating session for description " + description);
}
}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/om/OSGiActivator.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/om/OSGiActivator.java
index 72045e8..0ac7598 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/om/OSGiActivator.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/om/OSGiActivator.java
@@ -34,6 +34,11 @@ public abstract class OSGiActivator implements BundleActivator
Net4j.Activator.traceStart(context);
start();
}
+ catch (Error error)
+ {
+ getOMBundle().logger().error(error);
+ throw error;
+ }
catch (Exception ex)
{
getOMBundle().logger().error(ex);
@@ -49,6 +54,11 @@ public abstract class OSGiActivator implements BundleActivator
stop();
getOMBundle().setBundleContext(null);
}
+ catch (Error error)
+ {
+ getOMBundle().logger().error(error);
+ throw error;
+ }
catch (Exception ex)
{
getOMBundle().logger().error(ex);