[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/net/Deluge DelugeManagerP.nc, 1.3, 1.4

[Razvan Musaloiu-E.]

Update of /cvsroot/tinyos/tinyos-2.x/tos/lib/net/Deluge
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6630/tos/lib/net/Deluge

Modified Files:
	DelugeManagerP.nc 
Log Message:
Allow to consecutive dissemination commands (-d or -dr) without requiring an unlocking operation (-s or -ls).


Index: DelugeManagerP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/Deluge/DelugeManagerP.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DelugeManagerP.nc	15 Jan 2008 20:33:46 -0000	1.3
--- DelugeManagerP.nc	17 Jan 2008 22:27:38 -0000	1.4
***************
*** 91,95 ****
      case DELUGE_CMD_ONLY_DISSEMINATE:
      case DELUGE_CMD_DISSEMINATE_AND_REPROGRAM:
!       if (call Resource.immediateRequest() == SUCCESS) {
  	call DelugeMetadata.read(imgNum2volumeId[request->imgNum]);
        } else {
--- 91,96 ----
      case DELUGE_CMD_ONLY_DISSEMINATE:
      case DELUGE_CMD_DISSEMINATE_AND_REPROGRAM:
!       if (call Resource.isOwner() || 
! 	  call Resource.immediateRequest() == SUCCESS) {
  	call DelugeMetadata.read(imgNum2volumeId[request->imgNum]);
        } else {