[243987] Decouple Signal from IChannel

https://bugs.eclipse.org/bugs/show_bug.cgi?id=243987

3 files changed, 8 insertions, 9 deletions

diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerConsumer.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerConsumer.java
index aa4b795705..49f1c4396e 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerConsumer.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerConsumer.java
@@ -10,10 +10,10 @@
  **************************************************************************/
 package org.eclipse.net4j.jms.internal.server;
 
-import org.eclipse.net4j.channel.IChannel;
 import org.eclipse.net4j.internal.jms.MessageImpl;
 import org.eclipse.net4j.jms.internal.server.bundle.OM;
 import org.eclipse.net4j.jms.internal.server.protocol.JMSServerMessageRequest;
+import org.eclipse.net4j.jms.internal.server.protocol.JMSServerProtocol;
 import org.eclipse.net4j.jms.server.IServerConsumer;
 import org.eclipse.net4j.jms.server.IStoreTransaction;
 import org.eclipse.net4j.util.io.IOUtil;
@@ -79,9 +79,9 @@ public class ServerConsumer implements IServerConsumer
     return noLocal;
   }
 
-  public IChannel getChannel()
+  public JMSServerProtocol getProtocol()
   {
-    return session.getConnection().getProtocol().getChannel();
+    return session.getConnection().getProtocol();
   }
 
   public boolean isDurable()
@@ -99,7 +99,7 @@ public class ServerConsumer implements IServerConsumer
         messages.put(messageID, message);
       }
 
-      new JMSServerMessageRequest(getChannel(), session.getID(), id, message).send();
+      new JMSServerMessageRequest(getProtocol(), session.getID(), id, message).send();
       transaction.messageSent(message, id);
       return true;
     }
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerMessageRequest.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerMessageRequest.java
index 6df0efbb37..4cc8a2b1ca 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerMessageRequest.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerMessageRequest.java
@@ -10,7 +10,6 @@
  **************************************************************************/
 package org.eclipse.net4j.jms.internal.server.protocol;
 
-import org.eclipse.net4j.channel.IChannel;
 import org.eclipse.net4j.internal.jms.MessageImpl;
 import org.eclipse.net4j.internal.jms.util.MessageUtil;
 import org.eclipse.net4j.jms.JMSProtocolConstants;
@@ -30,9 +29,9 @@ public class JMSServerMessageRequest extends Request
 
   private MessageImpl message;
 
-  public JMSServerMessageRequest(IChannel channel, int sessionID, long consumerID, MessageImpl message)
+  public JMSServerMessageRequest(JMSServerProtocol protocol, int sessionID, long consumerID, MessageImpl message)
   {
-    super(channel);
+    super(protocol);
     this.sessionID = sessionID;
     this.consumerID = consumerID;
     this.message = message;
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IServerConsumer.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IServerConsumer.java
index a2c0aeb079..ea249d0cc8 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IServerConsumer.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IServerConsumer.java
@@ -10,7 +10,7 @@
  **************************************************************************/
 package org.eclipse.net4j.jms.server;
 
-import org.eclipse.net4j.channel.IChannel;
+import org.eclipse.net4j.protocol.IProtocol;
 
 /**
  * @author Eike Stepper
@@ -26,7 +26,7 @@ public interface IServerConsumer
 
   public ISession getSession();
 
-  public IChannel getChannel();
+  public IProtocol getProtocol();
 
   public boolean isNoLocal();