diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2015-02-11 14:52:27 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2015-02-11 14:52:27 +0000 |
| commit | 503b33b9c8ae17a5dc77b8a306a120ea8cdb31d4 (patch) | |
| tree | 1524aa973186b47fe4b0222e117569a25d2a67ad /qpid/java | |
| parent | b9a7752b59c48e5177e069c6cd4461f3d3678685 (diff) | |
| download | qpid-python-503b33b9c8ae17a5dc77b8a306a120ea8cdb31d4.tar.gz | |
some more fixes
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1658974 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
3 files changed, 12 insertions, 1 deletions
diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/pom.xml b/qpid/java/broker-plugins/amqp-0-8-protocol/pom.xml index 0c5d20a0a6..e09a3ba922 100644 --- a/qpid/java/broker-plugins/amqp-0-8-protocol/pom.xml +++ b/qpid/java/broker-plugins/amqp-0-8-protocol/pom.xml @@ -29,6 +29,10 @@ <name>Qpid AMQP 0-8 Protocol Broker Plug-in</name> <description>AMQP 0-8, 0-9 and 0-9-1 protocol broker plug-in</description> + <properties> + <qpid.home>${basedir}/../</qpid.home> <!-- override for broker tests --> + </properties> + <dependencies> <dependency> <groupId>org.apache.qpid</groupId> diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/NonBlockingSenderReceiver.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/NonBlockingSenderReceiver.java index c17ee500b0..ee99233063 100644 --- a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/NonBlockingSenderReceiver.java +++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/NonBlockingSenderReceiver.java @@ -244,7 +244,9 @@ public class NonBlockingSenderReceiver implements ByteBufferSender @Override public void flush() { + _stateChanged.set(true); _connection.getSelector().wakeup(); + } @Override diff --git a/qpid/java/test-profiles/JavaExcludes b/qpid/java/test-profiles/JavaExcludes index 9f88879ff2..95de7de220 100644 --- a/qpid/java/test-profiles/JavaExcludes +++ b/qpid/java/test-profiles/JavaExcludes @@ -28,4 +28,9 @@ org.apache.qpid.test.client.queue.QueuePolicyTest#testRejectPolicy org.apache.qpid.test.client.message.SelectorTest#testRuntimeSelectorError -org.apache.qpid.server.protocol.v0_8.AckTest +org.apache.qpid.server.protocol.v0_8.AckTest#* +org.apache.qpid.server.protocol.v0_8.AcknowledgeTest#* +org.apache.qpid.server.protocol.v0_8.AMQChannelTest#* +org.apache.qpid.server.protocol.v0_8.QueueBrowserUsesNoAckTest#* +org.apache.qpid.server.protocol.v0_8.MaxChannelsTest#* + |