SF.net SVN: fclient: [164] trunk/sandbox/fcp/fcp2_0_client.py

[<ju...@us...>]

Revision: 164
          http://fclient.svn.sourceforge.net/fclient/?rev=164&view=rev
Author:   jurner
Date:     2008-02-06 06:57:01 -0800 (Wed, 06 Feb 2008)

Log Message:
-----------
distinguish Removed from RemovedFromQueue

Modified Paths:
--------------
    trunk/sandbox/fcp/fcp2_0_client.py

Modified: trunk/sandbox/fcp/fcp2_0_client.py
===================================================================
--- trunk/sandbox/fcp/fcp2_0_client.py	2008-02-06 13:57:32 UTC (rev 163)
+++ trunk/sandbox/fcp/fcp2_0_client.py	2008-02-06 14:57:01 UTC (rev 164)
@@ -341,7 +341,7 @@
 		@param request: request to finalize
 		@param event: event to trigger or None
 				
-		@note: this method sets the requests L{consts.RequestStatus.Removed} and 
+		@note: this method sets the requests L{consts.RequestStatus.RemovedFromQueue} and 
 		L{consts.RequestStatus.Completed}	flags accordingly
 		@note: Fcp removes Get / Put requests with Persistence == connection emidiately
 		from its queue. Same goes all requests on ProtocolError. We inform the caller
@@ -353,7 +353,7 @@
 			#NOTE: non Get / Put related requests do not have a Persistence param
 			removeRequest = request.params.get('Persistence', consts.Persistence.Connection) == consts.Persistence.Connection
 		if removeRequest:
-			request['FcStatus'] |= consts.RequestStatus.Removed
+			request['FcStatus'] |= consts.RequestStatus.RemovedFromQueue
 					
 		if event is not None:
 			event(request)
@@ -969,6 +969,7 @@
 			if initialRequest is None:
 				return False
 			#TODO: notify user?
+			initialRequest['FcStatus'] |= consts.RequestStatus.Removed
 			self._finalizeRequest(msg, initialRequest, None)
 			return True	
 		
@@ -1831,7 +1832,7 @@
 		a RequestRemoved event is triggered as soon as the request has actually been removed
 		"""
 		initialRequest = self._requests[requestIdentifier]
-		initialRequest['FcStatus'] |= consts.RequestStatus.Removed
+		initialRequest['FcStatus'] |= consts.RequestStatus.Removed 
 		if initialRequest.name in consts.Message.ClientKeyRequestMessages:
 			self.sendMessage(
 				consts.Message.RemovePersistentRequest,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.