You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2015/09/12 09:05:48 UTC
svn commit: r1702592 - in /qpid/java/trunk:
broker-core/src/main/java/org/apache/qpid/server/exchange/
broker-core/src/main/java/org/apache/qpid/server/model/
broker-core/src/main/java/org/apache/qpid/server/virtualhost/
broker-core/src/test/java/org/a...
Author: orudyy
Date: Sat Sep 12 07:05:48 2015
New Revision: 1702592
URL: http://svn.apache.org/r1702592
Log:
QPID-6678: Deletion of exchanges set as alternate exchanges should not be allowed and deletion operation should not change state to DELETED for such exchanges
Add support for 'if-unused' flag in exchage.delete methods for 0.9.x and 0.10
Added:
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegateTest.java
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelReceiveTest.java
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ExchangeIsAlternateException.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/DirectExchangeTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/lifecycle/AbstractConfiguredObjectTest.java
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBean.java
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java?rev=1702592&r1=1702591&r2=1702592&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java Sat Sep 12 07:05:48 2015
@@ -829,11 +829,12 @@ public abstract class AbstractExchange<T
}
});
}
- catch (ExchangeIsAlternateException e)
+ catch(ExchangeIsAlternateException | RequiredExchangeException e)
{
-
+ // let management know about constraint violations
+ // in order to report error back to caller
+ return Futures.immediateFailedFuture(e);
}
- return Futures.immediateFuture(null);
}
@Override
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java?rev=1702592&r1=1702591&r2=1702592&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java Sat Sep 12 07:05:48 2015
@@ -1144,8 +1144,12 @@ public abstract class AbstractConfigured
protected ListenableFuture<Void> attainState()
{
+ return attainState(getDesiredState());
+ }
+
+ private ListenableFuture<Void> attainState(State desiredState)
+ {
final State currentState = getState();
- State desiredState = getDesiredState();
ListenableFuture<Void> returnVal;
if (_attainStateFuture.isDone())
@@ -1315,16 +1319,43 @@ public abstract class AbstractConfigured
authoriseSetAttributes(proxyForValidation, desiredStateOnlySet);
validateChange(proxyForValidation, desiredStateOnlySet);
- if (changeAttribute(ConfiguredObject.DESIRED_STATE, currentDesiredState, desiredState))
+ if (desiredState == State.DELETED)
{
- attributeSet(ConfiguredObject.DESIRED_STATE,
- currentDesiredState,
- desiredState);
- return attainStateIfOpenedOrReopenFailed();
+ // for DELETED state we should invoke transition method first to make sure that object can be deleted.
+ // If method results in exception being thrown due to various integrity violations
+ // then object cannot be deleted without prior resolving of integrity violations.
+ // The state transition should be disallowed.
+ if (desiredState != currentDesiredState)
+ {
+ return doAfter(attainState(desiredState), new Runnable()
+ {
+ @Override
+ public void run()
+ {
+ // state transition notification should be already issued.
+ // changing attribute value and notifying listeners about attribute change
+ // in case when any listener relies on attribute change rather then on state change
+ changeAttribute(ConfiguredObject.DESIRED_STATE, currentDesiredState, desiredState);
+ attributeSet(ConfiguredObject.DESIRED_STATE, currentDesiredState, desiredState);
+ }
+ });
+ }
+ else
+ {
+ return Futures.immediateFuture(null);
+ }
}
else
{
- return Futures.immediateFuture(null);
+ if (changeAttribute(ConfiguredObject.DESIRED_STATE, currentDesiredState, desiredState))
+ {
+ attributeSet(ConfiguredObject.DESIRED_STATE, currentDesiredState, desiredState);
+ return attainStateIfOpenedOrReopenFailed();
+ }
+ else
+ {
+ return Futures.immediateFuture(null);
+ }
}
}
}
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ExchangeIsAlternateException.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ExchangeIsAlternateException.java?rev=1702592&r1=1702591&r2=1702592&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ExchangeIsAlternateException.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ExchangeIsAlternateException.java Sat Sep 12 07:05:48 2015
@@ -24,6 +24,6 @@ public class ExchangeIsAlternateExceptio
{
public ExchangeIsAlternateException(String name)
{
- super(name);
+ super("Exchange '" + name + "' is in use as an alternate exchange");
}
}
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/DirectExchangeTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/DirectExchangeTest.java?rev=1702592&r1=1702591&r2=1702592&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/DirectExchangeTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/DirectExchangeTest.java Sat Sep 12 07:05:48 2015
@@ -21,21 +21,24 @@ package org.apache.qpid.server.exchange;
import java.util.HashMap;
import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import com.google.common.util.concurrent.ListenableFuture;
import org.apache.qpid.exchange.ExchangeDefaults;
import org.apache.qpid.server.model.Exchange;
+import org.apache.qpid.server.model.Queue;
+import org.apache.qpid.server.model.State;
import org.apache.qpid.server.util.BrokerTestHelper;
+import org.apache.qpid.server.virtualhost.ExchangeIsAlternateException;
import org.apache.qpid.server.virtualhost.ReservedExchangeNameException;
import org.apache.qpid.server.virtualhost.VirtualHostImpl;
import org.apache.qpid.test.utils.QpidTestCase;
public class DirectExchangeTest extends QpidTestCase
{
-
private DirectExchange _exchange;
private VirtualHostImpl _vhost;
-
@Override
public void setUp() throws Exception
{
@@ -118,4 +121,57 @@ public class DirectExchangeTest extends
}
+ public void testDeleteWithChecksOfExchangeSetAsAlternate() throws Exception
+ {
+ Map<String, Object> attributes = new HashMap<>();
+ attributes.put(Queue.NAME, getTestName());
+ attributes.put(Queue.DURABLE, false);
+ attributes.put(Queue.ALTERNATE_EXCHANGE, _exchange.getName());
+
+ Queue queue = (Queue) _vhost.createChild(Queue.class, attributes);
+ queue.open();
+
+ assertEquals("Unexpected alternate exchange on queue", _exchange, queue.getAlternateExchange());
+
+ try
+ {
+ ListenableFuture<Void> deleteFuture = _exchange.deleteWithChecks();
+ deleteFuture.get(1000, TimeUnit.MILLISECONDS);
+ fail("Exchange deletion should fail with ExchangeIsAlternateException");
+ }
+ catch(ExchangeIsAlternateException e)
+ {
+ // pass
+ }
+
+ assertEquals("Unexpected effective exchange state", State.ACTIVE, _exchange.getState());
+ assertEquals("Unexpected desired exchange state", State.ACTIVE, _exchange.getDesiredState());
+ }
+
+ public void testDeleteOfExchangeSetAsAlternate() throws Exception
+ {
+ Map<String, Object> attributes = new HashMap<>();
+ attributes.put(Queue.NAME, getTestName());
+ attributes.put(Queue.DURABLE, false);
+ attributes.put(Queue.ALTERNATE_EXCHANGE, _exchange.getName());
+
+ Queue queue = (Queue) _vhost.createChild(Queue.class, attributes);
+ queue.open();
+
+ assertEquals("Unexpected alternate exchange on queue", _exchange, queue.getAlternateExchange());
+
+ try
+ {
+ _exchange.delete();
+ fail("Exchange deletion should fail with ExchangeIsAlternateException");
+ }
+ catch(ExchangeIsAlternateException e)
+ {
+ // pass
+ }
+
+ assertEquals("Unexpected effective exchange state", State.ACTIVE, _exchange.getState());
+ assertEquals("Unexpected desired exchange state", State.ACTIVE, _exchange.getDesiredState());
+ }
+
}
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/lifecycle/AbstractConfiguredObjectTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/lifecycle/AbstractConfiguredObjectTest.java?rev=1702592&r1=1702591&r2=1702592&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/lifecycle/AbstractConfiguredObjectTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/lifecycle/AbstractConfiguredObjectTest.java Sat Sep 12 07:05:48 2015
@@ -18,16 +18,19 @@
*/
package org.apache.qpid.server.model.testmodels.lifecycle;
+import java.util.ArrayList;
import java.util.Collections;
+import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
import com.google.common.util.concurrent.ListenableFuture;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
-import org.apache.qpid.server.model.ConfigurationChangeListener;
import org.apache.qpid.server.model.ConfiguredObject;
+import org.apache.qpid.server.model.Exchange;
import org.apache.qpid.server.model.IllegalStateTransitionException;
+import org.apache.qpid.server.model.NoopConfigurationChangeListener;
import org.apache.qpid.server.model.Port;
import org.apache.qpid.server.model.State;
import org.apache.qpid.test.utils.QpidTestCase;
@@ -228,7 +231,7 @@ public class AbstractConfiguredObjectTes
final AtomicReference<State> newState = new AtomicReference<>();
final AtomicInteger callCounter = new AtomicInteger();
- parent.addChangeListener(new NoopChangeListener()
+ parent.addChangeListener(new NoopConfigurationChangeListener()
{
@Override
public void stateChanged(final ConfiguredObject<?> object, final State old, final State state)
@@ -244,7 +247,7 @@ public class AbstractConfiguredObjectTes
assertEquals(1, callCounter.get());
}
- public void testUnsuccessfulStateTransitionDoesnotInvokesListener() throws Exception
+ public void testUnsuccessfulStateTransitionDoesNotInvokesListener() throws Exception
{
final IllegalStateTransitionException expectedException =
new IllegalStateTransitionException("This test fails the state transition.");
@@ -259,7 +262,7 @@ public class AbstractConfiguredObjectTes
parent.create();
final AtomicInteger callCounter = new AtomicInteger();
- parent.addChangeListener(new NoopChangeListener()
+ parent.addChangeListener(new NoopConfigurationChangeListener()
{
@Override
public void stateChanged(final ConfiguredObject<?> object, final State old, final State state)
@@ -267,6 +270,13 @@ public class AbstractConfiguredObjectTes
super.stateChanged(object, old, state);
callCounter.incrementAndGet();
}
+
+ @Override
+ public void attributeSet(ConfiguredObject<?> object, String attributeName, Object oldAttributeValue, Object newAttributeValue)
+ {
+ super.attributeSet(object, attributeName, oldAttributeValue, newAttributeValue);
+ callCounter.incrementAndGet();
+ }
});
try
@@ -279,47 +289,96 @@ public class AbstractConfiguredObjectTes
assertSame("State transition threw unexpected exception.", expectedException, e);
}
assertEquals(0, callCounter.get());
+ assertEquals(State.ACTIVE, parent.getDesiredState());
+ assertEquals(State.ACTIVE, parent.getState());
}
- private static class NoopChangeListener implements ConfigurationChangeListener
+
+ public void testSuccessfulDeletion() throws Exception
{
- @Override
- public void stateChanged(final ConfiguredObject<?> object, final State oldState, final State newState)
+ TestConfiguredObject configuredObject = new TestConfiguredObject("configuredObject");
+ configuredObject.create();
+
+ final List<ChangeEvent> events = new ArrayList<>();
+ configuredObject.addChangeListener(new NoopConfigurationChangeListener()
{
+ @Override
+ public void attributeSet(ConfiguredObject<?> object, String attributeName, Object oldAttributeValue, Object newAttributeValue)
+ {
+ events.add(new ChangeEvent(EventType.ATTRIBUTE_SET, object, attributeName, oldAttributeValue, newAttributeValue));
+ }
- }
+ @Override
+ public void stateChanged(ConfiguredObject<?> object, State oldState, State newState)
+ {
+ events.add(new ChangeEvent(EventType.STATE_CHANGED, object, ConfiguredObject.DESIRED_STATE, oldState, newState));
+ }
+ });
- @Override
- public void childAdded(final ConfiguredObject<?> object, final ConfiguredObject<?> child)
- {
+ configuredObject.delete();
+ assertEquals(2, events.size());
+ assertEquals(State.DELETED, configuredObject.getDesiredState());
+ assertEquals(State.DELETED, configuredObject.getState());
- }
+ assertEquals("Unexpected events number", 2, events.size());
+ ChangeEvent event0 = events.get(0);
+ ChangeEvent event1 = events.get(1);
- @Override
- public void childRemoved(final ConfiguredObject<?> object, final ConfiguredObject<?> child)
- {
+ assertEquals("Unexpected first event: " + event0,
+ new ChangeEvent(EventType.STATE_CHANGED, configuredObject, Exchange.DESIRED_STATE, State.ACTIVE, State.DELETED), event0 );
+ assertEquals("Unexpected second event: " + event1,
+ new ChangeEvent(EventType.ATTRIBUTE_SET, configuredObject, Exchange.DESIRED_STATE, State.ACTIVE, State.DELETED), event1 );
+ }
- }
+ private enum EventType
+ {
+ ATTRIBUTE_SET,
+ STATE_CHANGED
+ }
- @Override
- public void attributeSet(final ConfiguredObject<?> object,
- final String attributeName,
- final Object oldAttributeValue,
- final Object newAttributeValue)
- {
+ private class ChangeEvent
+ {
+ private final ConfiguredObject<?> _source;
+ private final String _attributeName;
+ private final Object _oldValue;
+ private final Object _newValue;
+ private final EventType _eventType;
+ public ChangeEvent(EventType eventType, ConfiguredObject<?> source, String attributeName, Object oldValue, Object newValue)
+ {
+ _source = source;
+ _attributeName = attributeName;
+ _oldValue = oldValue;
+ _newValue = newValue;
+ _eventType = eventType;
}
@Override
- public void bulkChangeStart(final ConfiguredObject<?> object)
+ public boolean equals(Object o)
{
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+
+ ChangeEvent that = (ChangeEvent) o;
+
+ return (_source != null ? _source.equals(that._source) : that._source == null)
+ && (_attributeName != null ? _attributeName.equals(that._attributeName) : that._attributeName == null)
+ && (_oldValue != null ? _oldValue.equals(that._oldValue) : that._oldValue == null)
+ && (_newValue != null ? _newValue.equals(that._newValue) : that._newValue == null)
+ && _eventType == that._eventType;
}
@Override
- public void bulkChangeEnd(final ConfiguredObject<?> object)
+ public String toString()
{
-
+ return "ChangeEvent{" +
+ "_source=" + _source +
+ ", _attributeName='" + _attributeName + '\'' +
+ ", _oldValue=" + _oldValue +
+ ", _newValue=" + _newValue +
+ ", _eventType=" + _eventType +
+ '}';
}
}
}
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java?rev=1702592&r1=1702591&r2=1702592&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java Sat Sep 12 07:05:48 2015
@@ -1005,7 +1005,14 @@ public class ServerSessionDelegate exten
}
else
{
- virtualHost.removeExchange(exchange, !method.getIfUnused());
+ if (method.getIfUnused() && exchange.hasBindings())
+ {
+ exception(session, method, ExecutionErrorCode.PRECONDITION_FAILED, "Exchange has bindings");
+ }
+ else
+ {
+ virtualHost.removeExchange(exchange, !method.getIfUnused());
+ }
}
}
catch (ExchangeIsAlternateException e)
Added: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegateTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegateTest.java?rev=1702592&view=auto
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegateTest.java (added)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegateTest.java Sat Sep 12 07:05:48 2015
@@ -0,0 +1,94 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.qpid.server.protocol.v0_10;
+
+import static org.mockito.Matchers.argThat;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.apache.qpid.server.exchange.ExchangeImpl;
+import org.apache.qpid.server.queue.AMQQueue;
+import org.apache.qpid.server.virtualhost.VirtualHostImpl;
+import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.transport.ExchangeDelete;
+import org.apache.qpid.transport.ExecutionErrorCode;
+import org.apache.qpid.transport.ExecutionException;
+import org.apache.qpid.transport.Option;
+import org.mockito.ArgumentMatcher;
+
+public class ServerSessionDelegateTest extends QpidTestCase
+{
+ private VirtualHostImpl<?, AMQQueue<?>, ExchangeImpl<?>> _host;
+ private ServerSession _session;
+ private ServerSessionDelegate _delegate;
+
+ @Override
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ _host = mock(VirtualHostImpl.class);
+
+ ServerConnection serverConnection = mock(ServerConnection.class);
+ doReturn(_host).when(serverConnection).getVirtualHost();
+
+ _session = mock(ServerSession.class);
+ when(_session.getConnection()).thenReturn(serverConnection);
+
+ _delegate = new ServerSessionDelegate();
+ }
+
+ public void testExchangeDeleteWhenIfUsedIsSetAndExchangeHasBindings() throws Exception
+ {
+ ExchangeImpl<?> exchange = mock(ExchangeImpl.class);
+ when(exchange.hasBindings()).thenReturn(true);
+
+ doReturn(exchange).when(_host).getAttainedExchange(getTestName());
+
+ final ExchangeDelete method = new ExchangeDelete(getTestName(), Option.IF_UNUSED);
+ _delegate.exchangeDelete(_session, method);
+
+ verify(_session).invoke(argThat(new ArgumentMatcher<ExecutionException>()
+ {
+ public boolean matches(Object object)
+ {
+ ExecutionException exception = (ExecutionException)object;
+ return exception.getErrorCode() == ExecutionErrorCode.PRECONDITION_FAILED
+ && "Exchange has bindings".equals(exception.getDescription());
+ }
+ }));
+ }
+
+ public void testExchangeDeleteWhenIfUsedIsSetAndExchangeHasNoBinding() throws Exception
+ {
+ ExchangeImpl<?> exchange = mock(ExchangeImpl.class);
+ when(exchange.hasBindings()).thenReturn(false);
+
+ doReturn(exchange).when(_host).getAttainedExchange(getTestName());
+
+ final ExchangeDelete method = new ExchangeDelete(getTestName(), Option.IF_UNUSED);
+ _delegate.exchangeDelete(_session, method);
+
+ verify(_host).removeExchange(exchange, false);
+ }
+
+}
Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java?rev=1702592&r1=1702591&r2=1702592&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java Sat Sep 12 07:05:48 2015
@@ -3068,11 +3068,18 @@ public class AMQChannel
}
else
{
- virtualHost.removeExchange(exchange, !ifUnused);
+ if (ifUnused && exchange.hasBindings())
+ {
+ closeChannel(AMQConstant.IN_USE, "Exchange has bindings");
+ }
+ else
+ {
+ virtualHost.removeExchange(exchange, !ifUnused);
- ExchangeDeleteOkBody responseBody = _connection.getMethodRegistry().createExchangeDeleteOkBody();
+ ExchangeDeleteOkBody responseBody = _connection.getMethodRegistry().createExchangeDeleteOkBody();
- _connection.writeFrame(responseBody.generateFrame(getChannelId()));
+ _connection.writeFrame(responseBody.generateFrame(getChannelId()));
+ }
}
}
}
Added: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelReceiveTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelReceiveTest.java?rev=1702592&view=auto
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelReceiveTest.java (added)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelReceiveTest.java Sat Sep 12 07:05:48 2015
@@ -0,0 +1,124 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.qpid.server.protocol.v0_8;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.security.Principal;
+import java.util.concurrent.Executor;
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.protocol.AMQConstant;
+import org.apache.qpid.server.configuration.updater.TaskExecutor;
+import org.apache.qpid.server.exchange.ExchangeImpl;
+import org.apache.qpid.server.logging.EventLogger;
+import org.apache.qpid.server.model.Broker;
+import org.apache.qpid.server.model.BrokerModel;
+import org.apache.qpid.server.model.Connection;
+import org.apache.qpid.server.model.Protocol;
+import org.apache.qpid.server.model.Transport;
+import org.apache.qpid.server.model.port.AmqpPort;
+import org.apache.qpid.server.queue.AMQQueue;
+import org.apache.qpid.server.store.MessageStore;
+import org.apache.qpid.server.virtualhost.VirtualHostImpl;
+import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.transport.ByteBufferSender;
+import org.apache.qpid.transport.network.AggregateTicker;
+import org.apache.qpid.transport.network.NetworkConnection;
+
+public class AMQChannelReceiveTest extends QpidTestCase
+{
+ private VirtualHostImpl<?, AMQQueue<?>, ExchangeImpl<?>> _virtualHost;
+ private AMQPConnection_0_8 _protocolSession;
+ private MessageStore _messageStore;
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ _virtualHost = mock(VirtualHostImpl.class);
+ when(_virtualHost.getContextValue(Integer.class, Broker.MESSAGE_COMPRESSION_THRESHOLD_SIZE)).thenReturn(1);
+ when(_virtualHost.getContextValue(Long.class, Connection.MAX_UNCOMMITTED_IN_MEMORY_SIZE)).thenReturn(1l);
+ when(_virtualHost.getPrincipal()).thenReturn(mock(Principal.class));
+ when(_virtualHost.getEventLogger()).thenReturn(mock(EventLogger.class));
+
+ Broker<?> broker = mock(Broker.class);
+ when(broker.getEventLogger()).thenReturn(mock(EventLogger.class));
+ when(broker.getContextValue(Long.class, Broker.CHANNEL_FLOW_CONTROL_ENFORCEMENT_TIMEOUT)).thenReturn(1l);
+
+ NetworkConnection network = mock(NetworkConnection.class);
+ ByteBufferSender sender = mock(ByteBufferSender.class);
+ when(network.getSender()).thenReturn(sender);
+ AmqpPort<?> port = mock(AmqpPort.class);
+ TaskExecutor taskExecutor = mock(TaskExecutor.class);
+ when(taskExecutor.getExecutor()).thenReturn(mock(Executor.class));
+ when(port.getChildExecutor()).thenReturn(taskExecutor);
+ when(port.getModel()).thenReturn(BrokerModel.getInstance());
+ when(port.getContextValue(Integer.class, AmqpPort.PORT_MAX_MESSAGE_SIZE)).thenReturn(1);
+
+ _protocolSession = new AMQPConnection_0_8(broker, network, port, Transport.TCP, Protocol.AMQP_0_9, 1, new AggregateTicker());
+ _protocolSession.setVirtualHost(_virtualHost);
+
+ _messageStore = mock(MessageStore.class);
+ }
+
+ public void testReceiveExchangeDeleteWhenIfUsedIsSetAndExchangeHasBindings() throws Exception
+ {
+ ExchangeImpl<?> exchange = mock(ExchangeImpl.class);
+ when(exchange.hasBindings()).thenReturn(true);
+ doReturn(exchange).when(_virtualHost).getAttainedExchange(getTestName());
+
+ final AtomicReference<AMQConstant> closeCause = new AtomicReference<>();
+ final AtomicReference<String> closeMessage = new AtomicReference<>();
+ AMQChannel channel = new AMQChannel(_protocolSession, 1, _messageStore)
+ {
+ @Override
+ public void close(AMQConstant cause, String message)
+ {
+ super.close(cause, message);
+ closeCause.set(cause);
+ closeMessage.set(message);
+ }
+ };
+ channel.receiveExchangeDelete(AMQShortString.valueOf(getTestName()), true, false);
+
+ assertEquals("Unexpected close cause", AMQConstant.IN_USE, closeCause.get());
+ assertEquals("Unexpected close message", "Exchange has bindings", closeMessage.get());
+ }
+
+ public void testReceiveExchangeDeleteWhenIfUsedIsSetAndExchangeHasNoBinding() throws Exception
+ {
+ ExchangeImpl<?> exchange = mock(ExchangeImpl.class);
+ when(exchange.hasBindings()).thenReturn(false);
+ doReturn(exchange).when(_virtualHost).getAttainedExchange(getTestName());
+
+ AMQChannel channel = new AMQChannel(_protocolSession, 1, _messageStore);
+ channel.receiveExchangeDelete(AMQShortString.valueOf(getTestName()), true, false);
+
+ verify(_virtualHost).removeExchange(exchange, false);
+ }
+
+}
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java?rev=1702592&r1=1702591&r2=1702592&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java Sat Sep 12 07:05:48 2015
@@ -38,30 +38,29 @@ import java.util.Set;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.Part;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.model.AbstractConfiguredObject;
+import org.apache.qpid.server.model.Broker;
+import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.ConfiguredObjectOperation;
import org.apache.qpid.server.model.IllegalStateTransitionException;
import org.apache.qpid.server.model.IntegrityViolationException;
import org.apache.qpid.server.model.Content;
import org.apache.qpid.server.model.Model;
+import org.apache.qpid.server.util.urlstreamhandler.data.Handler;
import org.apache.qpid.server.util.ServerScopedRuntimeException;
import org.apache.qpid.server.virtualhost.ExchangeExistsException;
+import org.apache.qpid.server.virtualhost.ExchangeIsAlternateException;
+import org.apache.qpid.server.virtualhost.RequiredExchangeException;
import org.apache.qpid.server.virtualhost.QueueExistsException;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.apache.qpid.server.configuration.IllegalConfigurationException;
-import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.model.ConfiguredObject;
-import org.apache.qpid.server.util.urlstreamhandler.data.Handler;
import org.apache.qpid.util.DataUrlUtils;
public class RestServlet extends AbstractServlet
@@ -471,7 +470,7 @@ public class RestServlet extends Abstrac
}
catch (IllegalArgumentException | IllegalConfigurationException | IllegalStateException | AccessControlException
| ExchangeExistsException | QueueExistsException | IntegrityViolationException
- | IllegalStateTransitionException | NoClassDefFoundError e)
+ | IllegalStateTransitionException | NoClassDefFoundError | ExchangeIsAlternateException | RequiredExchangeException e)
{
setResponseStatus(request, response, e);
}
@@ -922,7 +921,9 @@ public class RestServlet extends Abstrac
|| e instanceof AbstractConfiguredObject.DuplicateIdException
|| e instanceof AbstractConfiguredObject.DuplicateNameException
|| e instanceof IntegrityViolationException
- || e instanceof IllegalStateTransitionException)
+ || e instanceof IllegalStateTransitionException
+ || e instanceof ExchangeIsAlternateException
+ || e instanceof RequiredExchangeException)
{
responseCode = HttpServletResponse.SC_CONFLICT;
}
Modified: qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBean.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBean.java?rev=1702592&r1=1702591&r2=1702592&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBean.java (original)
+++ qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBean.java Sat Sep 12 07:05:48 2015
@@ -51,6 +51,7 @@ import org.apache.qpid.server.model.Queu
import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.queue.QueueArgumentsConverter;
import org.apache.qpid.server.virtualhost.ExchangeExistsException;
+import org.apache.qpid.server.virtualhost.ExchangeIsAlternateException;
import org.apache.qpid.server.virtualhost.QueueExistsException;
import org.apache.qpid.server.virtualhost.RequiredExchangeException;
import org.apache.qpid.server.virtualhost.ReservedExchangeNameException;
@@ -219,7 +220,7 @@ public class VirtualHostManagerMBean ext
{
exchange.delete();
}
- catch(RequiredExchangeException e)
+ catch(RequiredExchangeException | ExchangeIsAlternateException e)
{
throw new UnsupportedOperationException(e.getMessage(), e);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org