You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by lq...@apache.org on 2015/11/10 14:44:15 UTC
svn commit: r1713635 - in /qpid/java/trunk:
broker-core/src/main/java/org/apache/qpid/server/transport/
broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/
broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpi...
Author: lquack
Date: Tue Nov 10 13:44:15 2015
New Revision: 1713635
URL: http://svn.apache.org/viewvc?rev=1713635&view=rev
Log:
QPID-6833: [Java Broker] When adding a ticker wakeup the connection to ensure the ticker is taken into account
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SelectorThread.java
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SelectorThread.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SelectorThread.java?rev=1713635&r1=1713634&r2=1713635&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SelectorThread.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SelectorThread.java Tue Nov 10 13:44:15 2015
@@ -597,6 +597,10 @@ class SelectorThread extends Thread
{
_workQueue.add(new ConnectionProcessor(_scheduler, connection));
}
-
+ SelectionTask selectionTask = connection.getSelectionTask();
+ if (selectionTask != null)
+ {
+ selectionTask.wakeup();
+ }
}
}
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java?rev=1713635&r1=1713634&r2=1713635&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java Tue Nov 10 13:44:15 2015
@@ -1231,6 +1231,8 @@ public class ServerSession extends Sessi
public void addTicker(final Ticker ticker)
{
getConnection().getAmqpConnection().getAggregateTicker().addTicker(ticker);
+ // trigger a wakeup to ensure the ticker will be taken into account
+ getAMQPConnection().notifyWork();
}
@Override
Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java?rev=1713635&r1=1713634&r2=1713635&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java Tue Nov 10 13:44:15 2015
@@ -3780,6 +3780,8 @@ public class AMQChannel
public void addTicker(final Ticker ticker)
{
getConnection().getAggregateTicker().addTicker(ticker);
+ // trigger a wakeup to ensure the ticker will be taken into account
+ getAMQPConnection().notifyWork();
}
@Override
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java?rev=1713635&r1=1713634&r2=1713635&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java Tue Nov 10 13:44:15 2015
@@ -959,6 +959,8 @@ public class Session_1_0 implements Sess
public void addTicker(final Ticker ticker)
{
getConnection().getAmqpConnection().getAggregateTicker().addTicker(ticker);
+ // trigger a wakeup to ensure the ticker will be taken into account
+ getAMQPConnection().notifyWork();
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org