[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/ustutt/ncunit/java/avrora/sim/clock IntervalSynchronizer.java, 1.1, 1.2

[Andreas Lachenmann]

Update of /cvsroot/tinyos/tinyos-1.x/contrib/ustutt/ncunit/java/avrora/sim/clock
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv16729/contrib/ustutt/ncunit/java/avrora/sim/clock

Modified Files:
	IntervalSynchronizer.java 
Log Message:
integrated some bug fixes for Avrora

Index: IntervalSynchronizer.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/ustutt/ncunit/java/avrora/sim/clock/IntervalSynchronizer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IntervalSynchronizer.java	20 Feb 2007 12:33:04 -0000	1.1
--- IntervalSynchronizer.java	18 May 2007 12:22:32 -0000	1.2
***************
*** 241,247 ****
      public synchronized void removeNode(Simulation.Node t) {
          // don't try to remove a thread that's not here!
!         if ( !threadMap.containsKey(t) ) return;
          synchronized ( condition ) {
!             SynchEvent e = (SynchEvent)threadMap.get(t);
              e.removed = true; // just in case the thread is still running, don't let it synch
              if ( e.met ) meet_count--;
--- 241,248 ----
      public synchronized void removeNode(Simulation.Node t) {
          // don't try to remove a thread that's not here!
!         SimulatorThread st = t.getThread();
!         if ( !threadMap.containsKey(st) ) return;
          synchronized ( condition ) {
!             SynchEvent e = (SynchEvent)threadMap.get(st);
              e.removed = true; // just in case the thread is still running, don't let it synch
              if ( e.met ) meet_count--;