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

[Jonathan Hui]

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

Modified Files:
	Rebooter.java 
Log Message:
- Change way deluge detects whether an image is already running or not
using actual program name, unix time, and user hash, instead of
relying on the program image hash.



Index: Rebooter.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tools/java/net/tinyos/deluge/Rebooter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Rebooter.java	22 Jul 2005 17:52:37 -0000	1.1
--- Rebooter.java	6 Aug 2005 17:41:49 -0000	1.2
***************
*** 96,99 ****
--- 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 {
***************
*** 109,115 ****
      }
  
-     if ( pingReply.get_nodeDesc_uid() == pingReply.get_imgDesc_uid() )
-       throw new IllegalArgumentException( "already executing image" );
- 
      if( !force )
      {
--- 113,116 ----