Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugins/policies/TopicDeletePolicyTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugins/policies/TopicDeletePolicyTest.java?rev=1378496&r1=1378495&r2=1378496&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugins/policies/TopicDeletePolicyTest.java (original) +++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugins/policies/TopicDeletePolicyTest.java Wed Aug 29 10:32:08 2012 @@ -146,7 +146,7 @@ public class TopicDeletePolicyTest exten MockAMQQueue queue = createOwnedQueue(); - queue.addBinding(new Binding(null, null, "bindingKey", queue, new DirectExchange(), null)); + queue.addBinding(new Binding(null, "bindingKey", queue, new DirectExchange(), null)); policy.performPolicy(queue); @@ -165,7 +165,7 @@ public class TopicDeletePolicyTest exten MockAMQQueue queue = createOwnedQueue(); - queue.addBinding(new Binding(null, null, "bindingKey", queue, new TopicExchange(), null)); + queue.addBinding(new Binding(null, "bindingKey", queue, new TopicExchange(), null)); queue.setAutoDelete(false); @@ -186,7 +186,7 @@ public class TopicDeletePolicyTest exten final MockAMQQueue queue = createOwnedQueue(); - queue.addBinding(new Binding(null, null, "bindingKey", queue, new TopicExchange(), null)); + queue.addBinding(new Binding(null, "bindingKey", queue, new TopicExchange(), null)); setQueueToAutoDelete(queue); @@ -207,7 +207,7 @@ public class TopicDeletePolicyTest exten MockAMQQueue queue = createOwnedQueue(); - queue.addBinding(new Binding(null, null, "bindingKey", queue, new TopicExchange(), null)); + queue.addBinding(new Binding(null, "bindingKey", queue, new TopicExchange(), null)); policy.performPolicy(queue); @@ -233,7 +233,7 @@ public class TopicDeletePolicyTest exten MockAMQQueue queue = createOwnedQueue(); - queue.addBinding(new Binding(null, null, "bindingKey", queue, new TopicExchange(), null)); + queue.addBinding(new Binding(null, "bindingKey", queue, new TopicExchange(), null)); policy.performPolicy(queue); @@ -253,7 +253,7 @@ public class TopicDeletePolicyTest exten MockAMQQueue queue = createOwnedQueue(); - queue.addBinding(new Binding(null, null, "bindingKey", queue, new TopicExchange(), null)); + queue.addBinding(new Binding(null, "bindingKey", queue, new TopicExchange(), null)); policy.performPolicy(queue);
Modified: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java?rev=1378496&r1=1378495&r2=1378496&view=diff ============================================================================== --- qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java (original) +++ qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java Wed Aug 29 10:32:08 2012 @@ -74,7 +74,6 @@ public class Connection extends Connecti public static final int MAX_CHANNEL_MAX = 0xFFFF; public static final int MIN_USABLE_CHANNEL_NUM = 0; - public enum State { NEW, CLOSED, OPENING, OPEN, CLOSING, CLOSE_RCVD, RESUMING } static class DefaultConnectionListener implements ConnectionListener @@ -233,8 +232,8 @@ public class Connection extends Connecti } NetworkConnection network = transport.connect(settings, secureReceiver, null); - _remoteAddress = network.getRemoteAddress(); - _localAddress = network.getLocalAddress(); + setRemoteAddress(network.getRemoteAddress()); + setLocalAddress(network.getLocalAddress()); final Sender<ByteBuffer> secureSender = securityLayer.sender(network.getSender()); if(secureSender instanceof ConnectionListener) @@ -728,6 +727,17 @@ public class Connection extends Connecti return _localAddress; } + protected void setRemoteAddress(SocketAddress remoteAddress) + { + _remoteAddress = remoteAddress; + } + + protected void setLocalAddress(SocketAddress localAddress) + { + _localAddress = localAddress; + } + + private void invokeSessionDetached(int channel, SessionDetachCode sessionDetachCode) { SessionDetached sessionDetached = new SessionDetached(); Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java?rev=1378496&r1=1378495&r2=1378496&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java Wed Aug 29 10:32:08 2012 @@ -27,8 +27,6 @@ import org.apache.qpid.AMQStoreException import org.apache.qpid.framing.FieldTable; import org.apache.qpid.server.binding.Binding; import org.apache.qpid.server.exchange.Exchange; -import org.apache.qpid.server.federation.Bridge; -import org.apache.qpid.server.federation.BrokerLink; import org.apache.qpid.server.message.EnqueableMessage; import org.apache.qpid.server.message.ServerMessage; import org.apache.qpid.server.queue.AMQQueue; @@ -322,35 +320,6 @@ public class SlowMessageStore implements doPostDelay("updateQueue"); } - - public void createBrokerLink(final BrokerLink link) throws AMQStoreException - { - doPreDelay("createBrokerLink"); - _durableConfigurationStore.createBrokerLink(link); - doPostDelay("createBrokerLink"); - } - - public void deleteBrokerLink(final BrokerLink link) throws AMQStoreException - { - doPreDelay("deleteBrokerLink"); - _durableConfigurationStore.deleteBrokerLink(link); - doPostDelay("deleteBrokerLink"); - } - - public void createBridge(final Bridge bridge) throws AMQStoreException - { - doPreDelay("createBridge"); - _durableConfigurationStore.createBridge(bridge); - doPostDelay("createBridge"); - } - - public void deleteBridge(final Bridge bridge) throws AMQStoreException - { - doPreDelay("deleteBridge"); - _durableConfigurationStore.deleteBridge(bridge); - doPostDelay("deleteBridge"); - } - @Override public void activate() throws Exception { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
