cvs commit: incubator-geronimo/sandbox/messaging/src/java/org/apache/geronimo/messaging/remotenode RemoteNodeManagerImpl.java

[gdamour]

gdamour     2004/05/27 07:27:32

  Modified:    
sandbox/messaging/src/java/org/apache/geronimo/messaging/remotenode/network
                        NodeServerImpl.java
               
sandbox/messaging/src/java/org/apache/geronimo/messaging/remotenode
                        RemoteNodeManagerImpl.java
  Log:
  The initial handshake Msgs exchanged between two Nodes have now
  a "correct" header.
  
  Revision  Changes    Path
  1.2       +2 -4      
incubator-geronimo/sandbox/messaging/src/java/org/apache/geronimo/messaging/remotenode/network/NodeServerImpl.java
  
  Index: NodeServerImpl.java
  ===================================================================
  RCS file: 
/home/cvs/incubator-geronimo/sandbox/messaging/src/java/org/apache/geronimo/messaging/remotenode/network/NodeServerImpl.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- NodeServerImpl.java       11 May 2004 12:06:42 -0000      1.1
  +++ NodeServerImpl.java       27 May 2004 14:27:32 -0000      1.2
  @@ -177,9 +177,7 @@
               }
               remoteNode.addConnection(connection);
               
  -            Msg msg = new Msg();
  -            MsgHeader header = msg.getHeader();
  -            header.addHeader(MsgHeaderConstants.DEST_NODE, otherNodeInfo);
  +            Msg msg = aMsg.reply();
               msg.getBody().setContent(Boolean.TRUE);
               connection.getMsgConsumerOut().push(msg);
           }
  
  
  
  1.2       +10 -1     
incubator-geronimo/sandbox/messaging/src/java/org/apache/geronimo/messaging/remotenode/RemoteNodeManagerImpl.java
  
  Index: RemoteNodeManagerImpl.java
  ===================================================================
  RCS file: 
/home/cvs/incubator-geronimo/sandbox/messaging/src/java/org/apache/geronimo/messaging/remotenode/RemoteNodeManagerImpl.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- RemoteNodeManagerImpl.java        11 May 2004 12:06:42 -0000      1.1
  +++ RemoteNodeManagerImpl.java        27 May 2004 14:27:32 -0000      1.2
  @@ -34,6 +34,7 @@
   import org.apache.geronimo.messaging.NodeException;
   import org.apache.geronimo.messaging.NodeInfo;
   import org.apache.geronimo.messaging.NodeTopology;
  +import org.apache.geronimo.messaging.RequestSender;
   import org.apache.geronimo.messaging.interceptors.MsgOutInterceptor;
   import org.apache.geronimo.messaging.io.IOContext;
   
  @@ -170,7 +171,15 @@
               }
               Msg msg = new Msg();
               MsgHeader header = msg.getHeader();
  +            header.addHeader(MsgHeaderConstants.SRC_NODE, nodeInfo);
               header.addHeader(MsgHeaderConstants.DEST_NODE, aNodeInfo);
  +            
  +            // Only set to comply with a valid request. 
  +            header.addHeader(MsgHeaderConstants.DEST_NODES, aNodeInfo);
  +            header.addHeader(MsgHeaderConstants.SRC_ENDPOINT, "");
  +            header.addHeader(MsgHeaderConstants.CORRELATION_ID,
  +                new RequestSender.RequestID(new Integer(0)));
  +            
               msg.getBody().setContent(nodeInfo);
               remoteNode.getMsgConsumerOut().push(msg);