← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/protocol.py

  • Committer: Martin Pool
  • Date: 2009-07-24 03:15:56 UTC
  • mfrom: (4565 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4566.
  • Revision ID: mbp@sourcefrog.net-20090724031556-5zyef6f1ixtn6r3z
merge news

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/protocol.py
897
897
            # We do *not* set self.decoding_failed here.  The message handler
898
898
            # has raised an error, but the decoder is still able to parse bytes
899
899
            # and determine when this message ends.
900
 
            log_exception_quietly()
 
900
            if not isinstance(exception.exc_value, errors.UnknownSmartMethod):
 
901
                log_exception_quietly()
901
902
            self.message_handler.protocol_error(exception.exc_value)
902
903
            # The state machine is ready to continue decoding, but the
903
904
            # exception has interrupted the loop that runs the state machine.
1036
1037
            raise errors.SmartMessageHandlerError(sys.exc_info())
1037
1038
 
1038
1039
    def _state_accept_reading_unused(self):
1039
 
        self.unused_data = self._get_in_buffer()
 
1040
        self.unused_data += self._get_in_buffer()
1040
1041
        self._set_in_buffer(None)
1041
1042
 
1042
1043
    def next_read_size(self):