summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-03-30 02:01:45 (EDT)
committerEike Stepper2007-03-30 02:01:45 (EDT)
commit19268a2ee5d3194500b4ab71b73d2d213ecc4406 (patch)
tree13d4872f7c55eaf9c02f5fad1a00857c46b0854e
parent53c91feb5c6d7eab47e5be84989cbba2bd5581ae (diff)
downloadcdo-19268a2ee5d3194500b4ab71b73d2d213ecc4406.zip
cdo-19268a2ee5d3194500b4ab71b73d2d213ecc4406.tar.gz
cdo-19268a2ee5d3194500b4ab71b73d2d213ecc4406.tar.bz2
*** empty log message ***
-rw-r--r--plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ControlChannel.java2
-rw-r--r--plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/AcceptorsItemProvider.java2
-rw-r--r--plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/AdaptersItemProvider.java2
-rw-r--r--plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/ConnectorsItemProvider.java2
-rw-r--r--plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/FactoriesItemProvider.java2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/Connector.java3
6 files changed, 7 insertions, 6 deletions
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ControlChannel.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ControlChannel.java
index 8a8769b..ab1939a 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ControlChannel.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ControlChannel.java
@@ -67,7 +67,7 @@ public final class ControlChannel extends Channel
ByteBuffer byteBuffer = buffer.startPutting(CONTROL_CHANNEL_ID);
byteBuffer.put(OPCODE_REGISTRATION);
byteBuffer.putShort(channelIndex);
- BufferUtil.putUTF8(byteBuffer, protocol.getType());
+ BufferUtil.putUTF8(byteBuffer, protocol == null ? null : protocol.getType());
handleBuffer(buffer);
return registration.get(REGISTRATION_TIMEOUT);
diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/AcceptorsItemProvider.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/AcceptorsItemProvider.java
index 583b191..e4a0fde 100644
--- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/AcceptorsItemProvider.java
+++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/AcceptorsItemProvider.java
@@ -10,7 +10,7 @@
**************************************************************************/
package org.eclipse.net4j.internal.ui.views;
-import org.eclipse.net4j.container.internal.ui.bundle.SharedIcons;
+import org.eclipse.net4j.internal.ui.bundle.SharedIcons;
import org.eclipse.net4j.transport.IAcceptor;
import org.eclipse.net4j.transport.IBufferHandler;
import org.eclipse.net4j.transport.IChannel;
diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/AdaptersItemProvider.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/AdaptersItemProvider.java
index e042ab1..6097e77 100644
--- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/AdaptersItemProvider.java
+++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/AdaptersItemProvider.java
@@ -10,7 +10,7 @@
**************************************************************************/
package org.eclipse.net4j.internal.ui.views;
-import org.eclipse.net4j.container.internal.ui.bundle.SharedIcons;
+import org.eclipse.net4j.internal.ui.bundle.SharedIcons;
import org.eclipse.net4j.util.registry.IRegistryEvent;
import org.eclipse.swt.graphics.Image;
diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/ConnectorsItemProvider.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/ConnectorsItemProvider.java
index 23c3f7f..b7ab5f1 100644
--- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/ConnectorsItemProvider.java
+++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/ConnectorsItemProvider.java
@@ -10,7 +10,7 @@
**************************************************************************/
package org.eclipse.net4j.internal.ui.views;
-import org.eclipse.net4j.container.internal.ui.bundle.SharedIcons;
+import org.eclipse.net4j.internal.ui.bundle.SharedIcons;
import org.eclipse.net4j.transport.IBufferHandler;
import org.eclipse.net4j.transport.IChannel;
import org.eclipse.net4j.transport.IConnector;
diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/FactoriesItemProvider.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/FactoriesItemProvider.java
index aa4c2c0..3d6757e 100644
--- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/FactoriesItemProvider.java
+++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/FactoriesItemProvider.java
@@ -10,7 +10,7 @@
**************************************************************************/
package org.eclipse.net4j.internal.ui.views;
-import org.eclipse.net4j.container.internal.ui.bundle.SharedIcons;
+import org.eclipse.net4j.internal.ui.bundle.SharedIcons;
import org.eclipse.net4j.util.registry.IRegistry;
import org.eclipse.net4j.util.registry.IRegistryEvent;
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/Connector.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/Connector.java
index ca913e2..0cb1799 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/Connector.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/Connector.java
@@ -369,7 +369,8 @@ public abstract class Connector extends Lifecycle implements IConnector
LifecycleUtil.activate(protocol);
if (TRACER.isEnabled())
{
- TRACER.format("Opening channel {0} with protocol {1}", channelIndex, protocol.getType()); //$NON-NLS-1$
+ TRACER.format(
+ "Opening channel {0} with protocol {1}", channelIndex, protocol == null ? null : protocol.getType()); //$NON-NLS-1$
}
}
else