You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kg...@apache.org on 2013/01/25 19:35:40 UTC
svn commit: r1438639 - in /qpid/proton/trunk/proton-c:
bindings/python/proton.py src/engine/engine.c
Author: kgiusti
Date: Fri Jan 25 18:35:39 2013
New Revision: 1438639
URL: http://svn.apache.org/viewvc?rev=1438639&view=rev
Log:
NO-JIRA: cleanups
Modified:
qpid/proton/trunk/proton-c/bindings/python/proton.py
qpid/proton/trunk/proton-c/src/engine/engine.c
Modified: qpid/proton/trunk/proton-c/bindings/python/proton.py
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/bindings/python/proton.py?rev=1438639&r1=1438638&r2=1438639&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/bindings/python/proton.py (original)
+++ qpid/proton/trunk/proton-c/bindings/python/proton.py Fri Jan 25 18:35:39 2013
@@ -2445,11 +2445,6 @@ class Connector(object):
def __init__(self, _cxtr):
self._cxtr = _cxtr
- #def __del__(self):
- # if hasattr(self, "_cxtr"):
- # pn_connector_free(self._cxtr)
- # del self._cxtr
-
def next(self):
return wrap_connector(pn_connector_next(self._cxtr))
@@ -2503,11 +2498,6 @@ class Listener(object):
def __init__(self, _lsnr=None):
self._lsnr = _lsnr
- #def __del__(self):
- # if hasattr(self, "_lsnr"):
- # pn_listener_free(self._lsnr)
- # del self._lsnr
-
def next(self):
return wrap_listener(pn_listener_next(self._lsnr))
Modified: qpid/proton/trunk/proton-c/src/engine/engine.c
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/engine/engine.c?rev=1438639&r1=1438638&r2=1438639&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/engine/engine.c (original)
+++ qpid/proton/trunk/proton-c/src/engine/engine.c Fri Jan 25 18:35:39 2013
@@ -2569,17 +2569,15 @@ ssize_t pn_transport_output(pn_transport
break;
} else {
if (total > 0)
- break;
- if (n == PN_EOS) {
- if (transport->disp->trace & (PN_TRACE_RAW | PN_TRACE_FRM))
+ break; // return what was output
+ if (transport->disp->trace & (PN_TRACE_RAW | PN_TRACE_FRM)) {
+ if (n == PN_EOS)
pn_dispatcher_trace(transport->disp, 0, "-> EOS\n");
- return PN_EOS;
- } else {
- if (transport->disp->trace & (PN_TRACE_RAW | PN_TRACE_FRM))
+ else
pn_dispatcher_trace(transport->disp, 0, "-> EOS (%zi) %s\n", n,
pn_error_text(transport->error));
- return n;
}
+ return n;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org