*** empty log message ***

3 files changed, 2 insertions, 26 deletions

diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractOpenViewAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractOpenViewAction.java
index 9203ad8d50..5b853c81fb 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractOpenViewAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractOpenViewAction.java
@@ -10,8 +10,6 @@ import org.eclipse.ui.IWorkbenchPage;
  */
 public abstract class AbstractOpenViewAction extends SessionAction
 {
-  private static final int NUMBER_OF_SYSTEM_PACKAGES = 2;
-
   public AbstractOpenViewAction(IWorkbenchPage page, String text, String toolTipText, ImageDescriptor image,
       CDOSession session)
   {
@@ -21,6 +19,6 @@ public abstract class AbstractOpenViewAction extends SessionAction
   @Override
   public boolean isEnabled()
   {
-    return getSession().getPackageRegistry().size() > NUMBER_OF_SYSTEM_PACKAGES && super.isEnabled();
+    return !getSession().getPackageRegistry().isEmpty() && super.isEnabled();
   }
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOItemProvider.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOItemProvider.java
index 37e3d57b2d..9bb907575a 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOItemProvider.java
@@ -297,28 +297,6 @@ public class CDOItemProvider extends ContainerItemProvider
   {
   }
 
-  // @Override
-  // protected Display getDisplay()
-  // {
-  // Display display = getViewer().getControl().getDisplay();
-  // if (display == null)
-  // {
-  // display = Display.getCurrent();
-  // }
-  //
-  // if (display == null)
-  // {
-  // display = Display.getDefault();
-  // }
-  //
-  // if (display == null)
-  // {
-  // throw new IllegalStateException("display == null");
-  // }
-  //
-  // return display;
-  // }
-
   @Override
   protected void elementAdded(Object element, Object parent)
   {
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnector.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnector.java
index fb0dcc9152..de7c1fbc40 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnector.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnector.java
@@ -282,7 +282,7 @@ public abstract class TCPConnector extends Connector implements ITCPConnector, I
   {
     if (super.removeChannel(channel, actively))
     {
-      if (isConnected() && actively)
+      if (controlChannel != null && channel != null && isConnected() && actively)
       {
         controlChannel.deregisterChannel(channel.getChannelIndex());
       }