[Tinyos-2-commits] CVS: tinyos-2.x/support/sdk/java/net/tinyos/message Message.java, 1.1.2.3, 1.1.2.3.2.1

[Kevin Klues]

Update of /cvsroot/tinyos/tinyos-2.x/support/sdk/java/net/tinyos/message
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv18756/support/sdk/java/net/tinyos/message

Modified Files:
      Tag: tos-2-resource-pm-eval-cand
	Message.java 
Log Message:
Merging the development branch with the resource/power management evaluation branch.  After this merge all files except those already commited should be identical.

Index: Message.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/sdk/java/net/tinyos/message/Attic/Message.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.3.2.1
diff -C2 -d -r1.1.2.3 -r1.1.2.3.2.1
*** Message.java	8 Feb 2006 18:27:30 -0000	1.1.2.3
--- Message.java	15 May 2006 18:35:29 -0000	1.1.2.3.2.1
***************
*** 454,458 ****
  	if (bitOffset > 0) {
  	    length -= 8 - bitOffset;
! 	    val = (ubyte(byteOffset) & ((1 << (8 - bitOffset)) - 1)) << length;
  	    byteOffset++;
  	}
--- 454,458 ----
  	if (bitOffset > 0) {
  	    length -= 8 - bitOffset;
! 	    val = (long)(ubyte(byteOffset) & ((1 << (8 - bitOffset)) - 1)) << length;
  	    byteOffset++;
  	}