Author: rgodfrey
Date: Wed Nov 28 16:34:40 2012
New Revision: 1414799
URL: http://svn.apache.org/viewvc?rev=1414799&view=rev
Log:
QPID-4472 : [Java Broker] NPE with non-SASL AMQP 1.0 Connection
merged from trunk r1413627, r1413724
Modified:
qpid/branches/0.20/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java
qpid/branches/0.20/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0.java
(contents, props changed)
qpid/branches/0.20/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java
Modified:
qpid/branches/0.20/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.20/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java?rev=1414799&r1=1414798&r2=1414799&view=diff
==============================================================================
---
qpid/branches/0.20/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java
(original)
+++
qpid/branches/0.20/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java
Wed Nov 28 16:34:40 2012
@@ -329,7 +329,7 @@ public class MultiVersionProtocolEngine
public ServerProtocolEngine getProtocolEngine()
{
- return new ProtocolEngine_1_0_0(_appRegistry,_id);
+ return new ProtocolEngine_1_0_0(_network, _appRegistry,_id);
}
};
Modified:
qpid/branches/0.20/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.20/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0.java?rev=1414799&r1=1414798&r2=1414799&view=diff
==============================================================================
---
qpid/branches/0.20/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0.java
(original)
+++
qpid/branches/0.20/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0.java
Wed Nov 28 16:34:40 2012
@@ -97,10 +97,14 @@ public class ProtocolEngine_1_0_0 implem
- public ProtocolEngine_1_0_0(final IApplicationRegistry appRegistry, long
id)
+ public ProtocolEngine_1_0_0(final NetworkConnection networkDriver, final
IApplicationRegistry appRegistry, long id)
{
_appRegistry = appRegistry;
_connectionId = id;
+ if(networkDriver != null)
+ {
+ setNetworkConnection(networkDriver, networkDriver.getSender());
+ }
}
Propchange:
qpid/branches/0.20/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0.java:r1413627,1413724
Modified:
qpid/branches/0.20/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.20/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java?rev=1414799&r1=1414798&r2=1414799&view=diff
==============================================================================
---
qpid/branches/0.20/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java
(original)
+++
qpid/branches/0.20/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java
Wed Nov 28 16:34:40 2012
@@ -20,12 +20,31 @@
*/
package org.apache.qpid.server.protocol;
+import java.util.UUID;
+import java.util.concurrent.ScheduledFuture;
import org.apache.commons.configuration.XMLConfiguration;
import org.apache.qpid.protocol.ServerProtocolEngine;
+import org.apache.qpid.server.binding.BindingFactory;
import org.apache.qpid.server.configuration.ServerConfiguration;
+import org.apache.qpid.server.configuration.VirtualHostConfiguration;
+import org.apache.qpid.server.connection.IConnectionRegistry;
+import org.apache.qpid.server.exchange.ExchangeFactory;
+import org.apache.qpid.server.exchange.ExchangeRegistry;
+import org.apache.qpid.server.protocol.v1_0.LinkRegistry;
+import org.apache.qpid.server.queue.QueueRegistry;
import org.apache.qpid.server.registry.ApplicationRegistry;
+import org.apache.qpid.server.registry.IApplicationRegistry;
+import org.apache.qpid.server.security.*;
+import org.apache.qpid.server.stats.StatisticsCounter;
+import org.apache.qpid.server.store.MessageStore;
+import org.apache.qpid.server.txn.DtxRegistry;
import org.apache.qpid.server.util.TestApplicationRegistry;
+import org.apache.qpid.server.virtualhost.HouseKeepingTask;
+import org.apache.qpid.server.virtualhost.State;
+import org.apache.qpid.server.virtualhost.VirtualHost;
+import org.apache.qpid.server.virtualhost.VirtualHostImpl;
+import org.apache.qpid.server.virtualhost.VirtualHostRegistry;
import org.apache.qpid.test.utils.QpidTestCase;
import org.apache.qpid.transport.TestNetworkConnection;
@@ -42,6 +61,12 @@ public class MultiVersionProtocolEngineF
//the factory needs a registry instance
ApplicationRegistry.initialise(new TestApplicationRegistry(new
ServerConfiguration(new XMLConfiguration())));
+ // AMQP 1-0 connection needs default vhost to be present
+ VirtualHostRegistry virtualHostRegistry =
ApplicationRegistry.getInstance().getVirtualHostRegistry();
+ VirtualHostImpl vhostImpl = new
VirtualHostImpl(ApplicationRegistry.getInstance(), new
VirtualHostConfiguration("default",new XMLConfiguration()));
+ virtualHostRegistry.registerVirtualHost(vhostImpl);
+ virtualHostRegistry.setDefaultVirtualHostName("default");
+
}
protected void tearDown()
@@ -160,6 +185,7 @@ public class MultiVersionProtocolEngineF
assertEquals("ID was not as expected following receipt of the AMQP
version header", expectedID, engine.getConnectionId());
previousId = expectedID;
+ engine.closed();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
