cvs commit: incubator-geronimo/sandbox/messaging/src/java/org/apache/geronimo/messaging/remotenode/admin JoinReply.java JoinRequest.java RemoteNodeConnectionCommand.java

[gdamour]

gdamour     2004/06/03 07:51:16

  Modified:    
sandbox/messaging/src/java/org/apache/geronimo/messaging/remotenode/admin
                        JoinReply.java JoinRequest.java
                        RemoteNodeConnectionCommand.java
  Log:
  Fix the tab characters.
  
  Revision  Changes    Path
  1.2       +3 -3      
incubator-geronimo/sandbox/messaging/src/java/org/apache/geronimo/messaging/remotenode/admin/JoinReply.java
  
  Index: JoinReply.java
  ===================================================================
  RCS file: 
/home/cvs/incubator-geronimo/sandbox/messaging/src/java/org/apache/geronimo/messaging/remotenode/admin/JoinReply.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JoinReply.java    3 Jun 2004 14:39:44 -0000       1.1
  +++ JoinReply.java    3 Jun 2004 14:51:16 -0000       1.2
  @@ -41,10 +41,10 @@
           request = aRequest;
       }
       
  -     public void execute(RemoteNodeConnection aConnection) {
  +    public void execute(RemoteNodeConnection aConnection) {
           Msg msg = request.reply();
           msg.getBody().setContent(Boolean.TRUE);
           aConnection.getMsgConsumerOut().push(msg);
  -     }
  +    }
   
   }
  
  
  
  1.2       +6 -7      
incubator-geronimo/sandbox/messaging/src/java/org/apache/geronimo/messaging/remotenode/admin/JoinRequest.java
  
  Index: JoinRequest.java
  ===================================================================
  RCS file: 
/home/cvs/incubator-geronimo/sandbox/messaging/src/java/org/apache/geronimo/messaging/remotenode/admin/JoinRequest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JoinRequest.java  3 Jun 2004 14:39:44 -0000       1.1
  +++ JoinRequest.java  3 Jun 2004 14:51:16 -0000       1.2
  @@ -64,7 +64,7 @@
           joined = aJoined;
       }
       
  -     public void execute(RemoteNodeConnection aConnection) {
  +    public void execute(RemoteNodeConnection aConnection) {
           Msg msg = new Msg();
           MsgHeader header = msg.getHeader();
           header.addHeader(MsgHeaderConstants.SRC_NODE, joiner);
  @@ -80,16 +80,15 @@
   
           final FutureResult result = new FutureResult();
           aConnection.setMsgProducerOut(new MsgOutInterceptor() {
  -                     public void push(Msg aMsg) {
  +            public void push(Msg aMsg) {
                   result.set(aMsg);
  -                     }
  +            }
           });
           aConnection.getMsgConsumerOut().push(msg);
           Msg reply;
           try {
  -                     // waits 3 seconds for a reply.
  -            reply = (Msg) result.get();
  -//                   reply = (Msg) result.timedGet(3000);
  +            // waits 3 seconds for a reply.
  +            reply = (Msg) result.timedGet(3000);
           } catch (TimeoutException e) {
               throw new CommunicationException("Join request submitted by " +
                   joiner + " to " + joined + " has timed out.");
  
  
  
  1.2       +2 -2      
incubator-geronimo/sandbox/messaging/src/java/org/apache/geronimo/messaging/remotenode/admin/RemoteNodeConnectionCommand.java
  
  Index: RemoteNodeConnectionCommand.java
  ===================================================================
  RCS file: 
/home/cvs/incubator-geronimo/sandbox/messaging/src/java/org/apache/geronimo/messaging/remotenode/admin/RemoteNodeConnectionCommand.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- RemoteNodeConnectionCommand.java  3 Jun 2004 14:39:44 -0000       1.1
  +++ RemoteNodeConnectionCommand.java  3 Jun 2004 14:51:16 -0000       1.2
  @@ -32,6 +32,6 @@
        * 
        * @param aConnection Connection.
        */
  -     public void execute(RemoteNodeConnection aConnection);
  +    public void execute(RemoteNodeConnection aConnection);
   
   }