You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2014/08/13 18:52:22 UTC
svn commit: r1617756 - in /qpid/jms/trunk/src:
main/java/org/apache/qpid/jms/engine/AmqpConnectionDriverNetty.java
test/java/org/apache/qpid/jms/MessageIntegrationTest.java
test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java
Author: robbie
Date: Wed Aug 13 16:52:21 2014
New Revision: 1617756
URL: http://svn.apache.org/r1617756
Log:
QPIDJMS-25: update to support staged SASL negotiation rather than an immediately pipelined ANONYMOUS exchange, depends on some uncommitted PROTON SASL hacks/tweaks
Modified:
qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpConnectionDriverNetty.java
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/MessageIntegrationTest.java
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java
Modified: qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpConnectionDriverNetty.java
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpConnectionDriverNetty.java?rev=1617756&r1=1617755&r2=1617756&view=diff
==============================================================================
--- qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpConnectionDriverNetty.java (original)
+++ qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpConnectionDriverNetty.java Wed Aug 13 16:52:21 2014
@@ -185,16 +185,10 @@ public class AmqpConnectionDriverNetty e
Connection connection = _amqpConnection.getConnection();
Sasl sasl = _transport.sasl();
-//TODO: non-anonymous
-// if (sasl != null)
-// {
-// sasl.client();
-// }
-//
-// _amqpConnection.setSasl(sasl);
-
sasl.client();
- sasl.setMechanisms("ANONYMOUS");
+
+ _amqpConnection.setSasl(sasl);
+
_transport.bind(connection);
_collector = Collector.Factory.create();
@@ -232,6 +226,7 @@ public class AmqpConnectionDriverNetty e
tail.limit(tail.position() + min);
buf.readBytes(tail);
_transport.process();
+ processAmqpConnection();
dispatch();
}
} finally {
@@ -276,19 +271,22 @@ public class AmqpConnectionDriverNetty e
private void dispatch() {
+ System.out.println("Dispatch called");
synchronized (_amqpConnection) {
try
{
if (dispatching) {
+ System.out.println("Dispatch skipped");
return;
}
-
+ System.out.println("Dispatching");
dispatching = true;
Event ev;
while ((ev = _collector.peek()) != null) {
for (EventHandler h : handlers) {
Events.dispatch(ev, h);
- processAmqpConnection();
+ //TODO: delete
+ //processAmqpConnection();
}
_collector.pop();
}
@@ -350,7 +348,8 @@ public class AmqpConnectionDriverNetty e
_transport.pop(size);
offset -= size;
- processAmqpConnection();
+ //TODO: delete
+ //processAmqpConnection();
}
finally
{
@@ -402,10 +401,8 @@ public class AmqpConnectionDriverNetty e
private void processAmqpConnection()
{
+ System.out.println("Processing AmqpConnection");
_amqpConnection.process();
- // _amqpConnection.notifyAll();
-// _amqpConnection.process();
-// _amqpConnection.process();
}
}
Modified: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/MessageIntegrationTest.java
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/MessageIntegrationTest.java?rev=1617756&r1=1617755&r2=1617756&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/MessageIntegrationTest.java (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/MessageIntegrationTest.java Wed Aug 13 16:52:21 2014
@@ -716,10 +716,6 @@ public class MessageIntegrationTest exte
Message message = session.createTextMessage();
message.setJMSCorrelationID(stringCorrelationId);
- //TODO:delete
- //System.out.println("##### NOT SLEEPING #####");
- //Thread.sleep(500);
-
producer.send(message);
testPeer.waitForAllHandlersToComplete(3000);
Modified: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java?rev=1617756&r1=1617755&r2=1617756&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java Wed Aug 13 16:52:21 2014
@@ -273,12 +273,12 @@ public class TestAmqpPeer implements Aut
public void expectPlainConnect(String username, String password, boolean authorize)
{
- //TODO: remove this hack. This is just here to avoid changing all the tests.
- expectAnonymousConnect(authorize);
- }
-
- public void expectPlainConnectOrig(String username, String password, boolean authorize)
- {
+// //TODO: remove this hack. This is just here to avoid changing all the tests.
+// expectAnonymousConnect(authorize);
+// }
+//
+// public void expectPlainConnectOrig(String username, String password, boolean authorize)
+// {
SaslMechanismsFrame saslMechanismsFrame = new SaslMechanismsFrame().setSaslServerMechanisms(Symbol.valueOf("PLAIN"));
addHandler(new HeaderHandlerImpl(AmqpHeader.SASL_HEADER, AmqpHeader.SASL_HEADER,
new FrameSender(
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org