[Tinyos-beta-commits] CVS: tinyos-1.x/beta/Deluge/delugetools ImageInjector.java, 1.3, 1.4

[Jonathan Hui]

Update of /cvsroot/tinyos/tinyos-1.x/beta/Deluge/delugetools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27907

Modified Files:
	ImageInjector.java 
Log Message:
- Fixed a bug that caused injection to fail if the node did not have
GoldenImage installed.



Index: ImageInjector.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/delugetools/ImageInjector.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ImageInjector.java	20 Jan 2005 01:37:35 -0000	1.3
--- ImageInjector.java	2 Mar 2005 17:15:59 -0000	1.4
***************
*** 63,66 ****
--- 63,68 ----
  
      advMsg = (DelugeAdvMsg)pingReply.clone();
+     if (advMsg.get_nodeDesc_vNum() == DelugeConsts.DELUGE_INVALID_VNUM)
+       advMsg.set_nodeDesc_imgNum((short)0);
      advMsg.set_sourceAddr(pinger.getPCAddr());
      advMsg.set_type(DelugeConsts.DELUGE_ADV_PC);
***************
*** 161,165 ****
  	send(advMsg);
  	if (verbose) System.out.print(advMsg);
! 	Thread.currentThread().sleep(1000);
        } catch (Exception e) {
  	e.printStackTrace();
--- 163,167 ----
  	send(advMsg);
  	if (verbose) System.out.print(advMsg);
! 	Thread.currentThread().sleep(500);
        } catch (Exception e) {
  	e.printStackTrace();