Author: rhs
Date: Thu Jun 19 17:21:44 2014
New Revision: 1603948
URL: http://svn.apache.org/r1603948
Log:
removed extraneous is_valid check
Modified:
qpid/proton/trunk/proton-c/src/engine/event.c
Modified: qpid/proton/trunk/proton-c/src/engine/event.c
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/engine/event.c?rev=1603948&r1=1603947&r2=1603948&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/engine/event.c (original)
+++ qpid/proton/trunk/proton-c/src/engine/event.c Thu Jun 19 17:21:44 2014
@@ -80,7 +80,6 @@ void pn_collector_free(pn_collector_t *c
pn_event_t *pn_event(void);
static void pn_event_initialize(void *obj);
-static bool pn_event_is_valid(pn_event_t *event);
pn_event_t *pn_collector_put(pn_collector_t *collector, pn_event_type_t type)
{
@@ -115,12 +114,6 @@ pn_event_t *pn_collector_put(pn_collecto
pn_event_t *pn_collector_peek(pn_collector_t *collector)
{
- // discard any events for objects that no longer exist
- pn_event_t *event = collector->head;
- while (event && !pn_event_is_valid(event)) {
- pn_collector_pop(collector);
- event = collector->head;
- }
return collector->head;
}
@@ -322,18 +315,3 @@ const char *pn_event_type_name(pn_event_
return "<unrecognized>";
}
-
-static bool pn_event_is_valid(pn_event_t *event)
-{
- pn_delivery_t *d;
- pn_link_t *l;
- pn_session_t *s;
- pn_connection_t *c;
- pn_transport_t *t;
- return (event &&
- (!(d = pn_event_delivery(event)) || !d->local.settled) &&
- (!(l = pn_event_link(event)) || !l->endpoint.freed) &&
- (!(s = pn_event_session(event)) || !s->endpoint.freed) &&
- (!(c = pn_event_connection(event)) || !c->endpoint.freed) &&
- (!(t = pn_event_transport(event)) || !t->freed));
-}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
