[Tinyos-beta-commits] CVS: tinyos-1.x/beta/SystemCore/java/net/tinyos/deluge DelugeControl.java, 1.6, 1.6.4.1

[Kristin Wright]

Update of /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/java/net/tinyos/deluge
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8305/beta/SystemCore/java/net/tinyos/deluge

Modified Files:
      Tag: tos-1-1-8-candidate
	DelugeControl.java 
Log Message:
merge with trunk using the tos-1-1-8-postbugfix trunk snapshot

Index: DelugeControl.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/java/net/tinyos/deluge/DelugeControl.java,v
retrieving revision 1.6
retrieving revision 1.6.4.1
diff -C2 -d -r1.6 -r1.6.4.1
*** DelugeControl.java	26 Aug 2004 23:45:53 -0000	1.6
--- DelugeControl.java	11 Nov 2004 13:43:28 -0000	1.6.4.1
***************
*** 100,104 ****
      }
      
!     DripMsg dripMsg = new DripMsg();
      dripMsg.set_metadata_id((short)NetProgCmdMsg.AM_TYPE);
      dripMsg.set_metadata_seqno((byte)0);
--- 100,107 ----
      }
      
!     DripMsg dripMsg = new DripMsg(DripMsg.DEFAULT_MESSAGE_SIZE +
! 				  NamingMsg.DEFAULT_MESSAGE_SIZE +
! 				  NetProgCmdMsg.DEFAULT_MESSAGE_SIZE);
! 
      dripMsg.set_metadata_id((short)NetProgCmdMsg.AM_TYPE);
      dripMsg.set_metadata_seqno((byte)0);