You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2015/02/11 15:52:27 UTC

svn commit: r1658974 - in /qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java: broker-plugins/amqp-0-8-protocol/pom.xml common/src/main/java/org/apache/qpid/transport/network/io/NonBlockingSenderReceiver.java test-profiles/JavaExcludes

Author: rgodfrey
Date: Wed Feb 11 14:52:27 2015
New Revision: 1658974

URL: http://svn.apache.org/r1658974
Log:
some more fixes

Modified:
    qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/amqp-0-8-protocol/pom.xml
    qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/NonBlockingSenderReceiver.java
    qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/test-profiles/JavaExcludes

Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/amqp-0-8-protocol/pom.xml
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/amqp-0-8-protocol/pom.xml?rev=1658974&r1=1658973&r2=1658974&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/amqp-0-8-protocol/pom.xml (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/amqp-0-8-protocol/pom.xml Wed Feb 11 14:52:27 2015
@@ -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>

Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/NonBlockingSenderReceiver.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/NonBlockingSenderReceiver.java?rev=1658974&r1=1658973&r2=1658974&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/NonBlockingSenderReceiver.java (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/NonBlockingSenderReceiver.java Wed Feb 11 14:52:27 2015
@@ -244,7 +244,9 @@ public class NonBlockingSenderReceiver
     @Override
     public void flush()
     {
+        _stateChanged.set(true);
         _connection.getSelector().wakeup();
+
     }
 
     @Override

Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/test-profiles/JavaExcludes
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/test-profiles/JavaExcludes?rev=1658974&r1=1658973&r2=1658974&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/test-profiles/JavaExcludes (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/test-profiles/JavaExcludes Wed Feb 11 14:52:27 2015
@@ -28,4 +28,9 @@ org.apache.qpid.test.client.queue.QueueP
 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#*
+



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org