beepcore-java-commits

[Huston F. <hu...@us...>]

Update of /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core
In directory usw-pr-cvs1:/tmp/cvs-serv11530/core

Modified Files:
	MessageMSG.java MessageStatus.java 
Log Message:
ANS/NUL fix for Gabe

Index: MessageMSG.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core/MessageMSG.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** MessageMSG.java	10 Nov 2001 21:33:29 -0000	1.6
--- MessageMSG.java	30 Apr 2002 04:06:22 -0000	1.7
***************
*** 56,61 ****
              ++ansno;
  
!             m = new MessageStatus(this.channel, this.msgno, this.ansno,
!                                   stream);
          }
  
--- 56,61 ----
              ++ansno;
  
!             m = new MessageStatus(this.channel, MESSAGE_TYPE_ANS, this.msgno,
!                                   this.ansno, stream);
          }
  
***************
*** 146,151 ****
      public MessageStatus sendNUL() throws BEEPException
      {
          MessageStatus m = new MessageStatus(this.channel, MESSAGE_TYPE_NUL,
!                                             this.msgno, null);
          this.channel.sendMessage(m);
          return m;
--- 146,152 ----
      public MessageStatus sendNUL() throws BEEPException
      {
+         OutputDataStream ds = new ByteOutputDataStream(new byte[0]);
          MessageStatus m = new MessageStatus(this.channel, MESSAGE_TYPE_NUL,
!                                             this.msgno, ds);
          this.channel.sendMessage(m);
          return m;

Index: MessageStatus.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core/MessageStatus.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** MessageStatus.java	8 Nov 2001 05:51:34 -0000	1.3
--- MessageStatus.java	30 Apr 2002 04:06:22 -0000	1.4
***************
*** 55,59 ****
                    OutputDataStream data)
      {
!         this(channel, messageType, msgno, data, null);
      }
  
--- 55,59 ----
                    OutputDataStream data)
      {
!         this(channel, messageType, msgno, -1, data, null);
      }
  
***************
*** 64,67 ****
--- 64,73 ----
      }
  
+     MessageStatus(Channel channel, int messageType, int msgno, int ansno,
+                   OutputDataStream data)
+     {
+         this(channel, messageType, msgno, ansno, data, null);
+     }
+     
      MessageStatus(Channel channel, int messageType, int msgno, int ansno,
                    OutputDataStream data, ReplyListener replyListener)