Ticket #404: call_updatepending_when_untriggering_occupyresource.patch

File call_updatepending_when_untriggering_occupyresource.patch, 937 bytes (added by tommyb, 3 years ago)

Patch that tries to make sure that ReleaseResource? is correctly called

  • fso_actions.py

    old new  
    240240    def onResourceRequestReply( cls, name ): 
    241241        logger.debug( "onResourceRequestReply: %s" % name ) 
    242242        amount = cls.pending[name] 
    243         del cls.pending[name] 
    244         cls.held[name] = amount 
     243        if amount > 0: 
     244            del cls.pending[name] 
     245            cls.held[name] = amount 
    245246 
    246247    @classmethod 
    247248    def onResourceRequestError( cls, name, e ): 
     
    286287            if counter > 1: 
    287288                self.__class__.pending[self.resource] = counter - 1 
    288289            else: 
    289                 del self.__class__.pending[self.resource] 
     290                self.__class__.pending[self.resource] = 0 
     291                self.__class__.updatePending( self.resource ) 
    290292 
    291293        elif self.resource in self.__class__.held: 
    292294            counter = self.__class__.held[self.resource]