Author: rhs
Date: Thu Jun 19 17:23:00 2014
New Revision: 1603958
URL: http://svn.apache.org/r1603958
Log:
simplified event posting interface
Modified:
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/CollectorImpl.java
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ConnectionImpl.java
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/EndpointImpl.java
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/EventImpl.java
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/LinkImpl.java
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/SessionImpl.java
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportLink.java
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportSession.java
Modified:
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/CollectorImpl.java
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/CollectorImpl.java?rev=1603958&r1=1603957&r2=1603958&view=diff
==============================================================================
---
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/CollectorImpl.java
(original)
+++
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/CollectorImpl.java
Thu Jun 19 17:23:00 2014
@@ -58,18 +58,19 @@ public class CollectorImpl implements Co
}
}
- public EventImpl put(Event.Type type)
+ public EventImpl put(Event.Type type, Object context)
{
EventImpl event;
if (free == null) {
- event = new EventImpl(type);
+ event = new EventImpl();
} else {
event = free;
free = free.next;
event.next = null;
- event.type = type;
}
+ event.init(type, context);
+
if (head == null) {
head = event;
tail = event;
@@ -77,6 +78,7 @@ public class CollectorImpl implements Co
tail.next = event;
tail = event;
}
+
return event;
}
Modified:
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ConnectionImpl.java
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ConnectionImpl.java?rev=1603958&r1=1603957&r2=1603958&view=diff
==============================================================================
---
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ConnectionImpl.java
(original)
+++
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ConnectionImpl.java
Thu Jun 19 17:23:00 2014
@@ -201,10 +201,7 @@ public class ConnectionImpl extends Endp
setRemoteDesiredCapabilities(open.getDesiredCapabilities());
setRemoteOfferedCapabilities(open.getOfferedCapabilities());
setRemoteProperties(open.getProperties());
- EventImpl ev = put(Event.Type.CONNECTION_REMOTE_STATE);
- if (ev != null) {
- ev.init(this);
- }
+ put(Event.Type.CONNECTION_REMOTE_STATE, this);
}
@@ -573,10 +570,10 @@ public class ConnectionImpl extends Endp
_collector = (CollectorImpl) collector;
}
- EventImpl put(Event.Type type)
+ EventImpl put(Event.Type type, Object context)
{
if (_collector != null) {
- return _collector.put(type);
+ return _collector.put(type, context);
} else {
return null;
}
@@ -585,9 +582,6 @@ public class ConnectionImpl extends Endp
@Override
protected void localStateChanged()
{
- EventImpl ev = put(Event.Type.CONNECTION_LOCAL_STATE);
- if (ev != null) {
- ev.init(this);
- }
+ put(Event.Type.CONNECTION_LOCAL_STATE, this);
}
}
Modified:
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/EndpointImpl.java
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/EndpointImpl.java?rev=1603958&r1=1603957&r2=1603958&view=diff
==============================================================================
---
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/EndpointImpl.java
(original)
+++
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/EndpointImpl.java
Thu Jun 19 17:23:00 2014
@@ -131,10 +131,7 @@ public abstract class EndpointImpl imple
ConnectionImpl conn = getConnectionImpl();
TransportImpl trans = conn.getTransport();
if (trans != null) {
- EventImpl ev = conn.put(Event.Type.TRANSPORT);
- if (ev != null) {
- ev.init(trans);
- }
+ conn.put(Event.Type.TRANSPORT, trans);
}
}
}
Modified:
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/EventImpl.java
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/EventImpl.java?rev=1603958&r1=1603957&r2=1603958&view=diff
==============================================================================
---
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/EventImpl.java
(original)
+++
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/EventImpl.java
Thu Jun 19 17:23:00 2014
@@ -39,9 +39,15 @@ class EventImpl implements Event
Object context;
EventImpl next;
- EventImpl(Type type)
+ EventImpl()
+ {
+ this.type = null;
+ }
+
+ void init(Event.Type type, Object context)
{
this.type = type;
+ this.context = context;
}
void clear()
@@ -137,11 +143,6 @@ class EventImpl implements Event
}
}
- void init(Object context)
- {
- this.context = context;
- }
-
@Override
public String toString()
{
Modified:
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/LinkImpl.java
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/LinkImpl.java?rev=1603958&r1=1603957&r2=1603958&view=diff
==============================================================================
---
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/LinkImpl.java
(original)
+++
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/LinkImpl.java
Thu Jun 19 17:23:00 2014
@@ -377,9 +377,6 @@ public abstract class LinkImpl extends E
@Override
protected void localStateChanged()
{
- EventImpl ev = getConnectionImpl().put(Event.Type.LINK_LOCAL_STATE);
- if (ev != null) {
- ev.init(this);
- }
+ getConnectionImpl().put(Event.Type.LINK_LOCAL_STATE, this);
}
}
Modified:
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/SessionImpl.java
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/SessionImpl.java?rev=1603958&r1=1603957&r2=1603958&view=diff
==============================================================================
---
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/SessionImpl.java
(original)
+++
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/SessionImpl.java
Thu Jun 19 17:23:00 2014
@@ -186,9 +186,6 @@ public class SessionImpl extends Endpoin
@Override
protected void localStateChanged()
{
- EventImpl ev = getConnectionImpl().put(Event.Type.SESSION_LOCAL_STATE);
- if (ev != null) {
- ev.init(this);
- }
+ getConnectionImpl().put(Event.Type.SESSION_LOCAL_STATE, this);
}
}
Modified:
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java?rev=1603958&r1=1603957&r2=1603958&view=diff
==============================================================================
---
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java
(original)
+++
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java
Thu Jun 19 17:23:00 2014
@@ -974,10 +974,7 @@ public class TransportImpl extends Endpo
transportSession.setNextIncomingId(begin.getNextOutgoingId());
_remoteSessions.put(channel, transportSession);
- EventImpl ev =
_connectionEndpoint.put(Event.Type.SESSION_REMOTE_STATE);
- if (ev != null) {
- ev.init(session);
- }
+ _connectionEndpoint.put(Event.Type.SESSION_REMOTE_STATE, session);
}
}
@@ -1033,10 +1030,7 @@ public class TransportImpl extends Endpo
}
- EventImpl ev =
_connectionEndpoint.put(Event.Type.LINK_REMOTE_STATE);
- if (ev != null) {
- ev.init(link);
- }
+ _connectionEndpoint.put(Event.Type.LINK_REMOTE_STATE, link);
}
}
@@ -1107,10 +1101,7 @@ public class TransportImpl extends Endpo
link.getRemoteCondition().copyFrom(detach.getError());
}
- EventImpl ev =
_connectionEndpoint.put(Event.Type.LINK_REMOTE_STATE);
- if (ev != null) {
- ev.init(link);
- }
+ _connectionEndpoint.put(Event.Type.LINK_REMOTE_STATE, link);
}
else
{
@@ -1139,10 +1130,7 @@ public class TransportImpl extends Endpo
session.getRemoteCondition().copyFrom(errorCondition);
}
- EventImpl ev =
_connectionEndpoint.put(Event.Type.SESSION_REMOTE_STATE);
- if (ev != null) {
- ev.init(session);
- }
+ _connectionEndpoint.put(Event.Type.SESSION_REMOTE_STATE, session);
}
}
@@ -1159,10 +1147,7 @@ public class TransportImpl extends Endpo
_connectionEndpoint.getRemoteCondition().copyFrom(close.getError());
}
- EventImpl ev =
_connectionEndpoint.put(Event.Type.CONNECTION_REMOTE_STATE);
- if (ev != null) {
- ev.init(_connectionEndpoint);
- }
+ _connectionEndpoint.put(Event.Type.CONNECTION_REMOTE_STATE,
_connectionEndpoint);
}
}
Modified:
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportLink.java
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportLink.java?rev=1603958&r1=1603957&r2=1603958&view=diff
==============================================================================
---
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportLink.java
(original)
+++
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportLink.java
Thu Jun 19 17:23:00 2014
@@ -122,10 +122,7 @@ class TransportLink<T extends LinkImpl>
_remoteLinkCredit = flow.getLinkCredit();
- EventImpl ev = _link.getConnectionImpl().put(Event.Type.LINK_FLOW);
- if (ev != null) {
- ev.init(_link);
- }
+ _link.getConnectionImpl().put(Event.Type.LINK_FLOW, _link);
}
void setLinkCredit(UnsignedInteger linkCredit)
Modified:
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportSession.java
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportSession.java?rev=1603958&r1=1603957&r2=1603958&view=diff
==============================================================================
---
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportSession.java
(original)
+++
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportSession.java
Thu Jun 19 17:23:00 2014
@@ -308,10 +308,7 @@ class TransportSession
delivery.getLink().modified(false);
}
- EventImpl ev = getSession().getConnection().put(Event.Type.DELIVERY);
- if (ev != null) {
- ev.init(delivery);
- }
+ getSession().getConnection().put(Event.Type.DELIVERY, delivery);
}
public void freeLocalChannel()
@@ -394,10 +391,7 @@ class TransportSession
}
delivery.updateWork();
- EventImpl ev =
getSession().getConnection().put(Event.Type.DELIVERY);
- if (ev != null) {
- ev.init(delivery);
- }
+ getSession().getConnection().put(Event.Type.DELIVERY,
delivery);
}
id = id.add(UnsignedInteger.ONE);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
