[Tinyos-commits] CVS: tinyos-1.x/tools/java/net/tinyos/deluge Rebooter.java, 1.2, 1.3

[Jonathan Hui]

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

Modified Files:
	Rebooter.java 
Log Message:
- Allow rebooting to the same image.



Index: Rebooter.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tools/java/net/tinyos/deluge/Rebooter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Rebooter.java	6 Aug 2005 17:41:49 -0000	1.2
--- Rebooter.java	23 Aug 2005 07:37:53 -0000	1.3
***************
*** 96,103 ****
      if ( !pinger.existsError() && pingReply.get_imgDesc_numPgs() != 0 ) {
        System.out.println(image);
!       if ( pinger.getExecName().compareTo( newImage.getName() ) == 0 &&
! 	   pinger.getExecUnixTime() == newImage.getUnixTime() &&
! 	   pinger.getExecUserHash() == newImage.getUserHash() )
  	throw new IllegalArgumentException( "already executing image" );
      }
      else {
--- 96,105 ----
      if ( !pinger.existsError() && pingReply.get_imgDesc_numPgs() != 0 ) {
        System.out.println(image);
!       /*
! 	if ( pinger.getExecName().compareTo( newImage.getName() ) == 0 &&
! 	pinger.getExecUnixTime() == newImage.getUnixTime() &&
! 	pinger.getExecUserHash() == newImage.getUserHash() )
  	throw new IllegalArgumentException( "already executing image" );
+       */
      }
      else {