[Tinyos-beta-commits] CVS: tinyos-1.x/beta/SystemCore/java/net/tinyos/grouper GrouperControl.java, 1.4, 1.4.4.1

[Kristin Wright]

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

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

Index: GrouperControl.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/java/net/tinyos/grouper/GrouperControl.java,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -C2 -d -r1.4 -r1.4.4.1
*** GrouperControl.java	26 Aug 2004 22:59:24 -0000	1.4
--- GrouperControl.java	11 Nov 2004 13:43:28 -0000	1.4.4.1
***************
*** 24,29 ****
      }
  
!     DripMsg dripMsg = new DripMsg();
! 
      dripMsg.set_metadata_id((short)GrouperCmdMsg.AM_TYPE);
      dripMsg.set_metadata_seqno((byte)0);
--- 24,31 ----
      }
  
!     DripMsg dripMsg = new DripMsg(DripMsg.DEFAULT_MESSAGE_SIZE + 
! 				  NamingMsg.DEFAULT_MESSAGE_SIZE +
! 				  GrouperCmdMsg.DEFAULT_MESSAGE_SIZE);
!     
      dripMsg.set_metadata_id((short)GrouperCmdMsg.AM_TYPE);
      dripMsg.set_metadata_seqno((byte)0);
***************
*** 37,44 ****
      
      GrouperCmdMsg gcMsg = 
!       new GrouperCmdMsg(namingMsg,
! 			namingMsg.offset_data(0),
! 			GrouperCmdMsg.DEFAULT_MESSAGE_SIZE);
! 
      TOSBaseCmdMsg cmdMsg = new TOSBaseCmdMsg();
      
--- 39,45 ----
      
      GrouperCmdMsg gcMsg = 
! 	new GrouperCmdMsg(namingMsg, namingMsg.offset_data(0),
! 			  GrouperCmdMsg.DEFAULT_MESSAGE_SIZE);
!     
      TOSBaseCmdMsg cmdMsg = new TOSBaseCmdMsg();