This closes #2132

artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/AMQPConnectionContext.java

@@ -46,6 +46,8 @@ import org.apache.activemq.artemis.spi.core.remoting.ReadyListener;
 import org.apache.activemq.artemis.utils.ByteUtil;
 import org.apache.activemq.artemis.utils.VersionLoader;
 import org.apache.qpid.proton.amqp.Symbol;
+import org.apache.qpid.proton.amqp.messaging.Source;
+import org.apache.qpid.proton.amqp.messaging.TerminusExpiryPolicy;
 import org.apache.qpid.proton.amqp.transaction.Coordinator;
 import org.apache.qpid.proton.amqp.transport.ErrorCondition;
 import org.apache.qpid.proton.engine.Connection;
@@ -485,12 +487,19 @@ public class AMQPConnectionContext extends ProtonInitializable implements EventH
 
    @Override
    public void onRemoteDetach(Link link) throws Exception {
-      lock();
-      try {
-         link.detach();
-         link.free();
-      } finally {
-         unlock();
+      boolean handleAsClose = link.getSource() != null
+                              && ((Source) link.getSource()).getExpiryPolicy() == TerminusExpiryPolicy.LINK_DETACH;
+
+      if (handleAsClose) {
+         onRemoteClose(link);
+      } else {
+         lock();
+         try {
+            link.detach();
+            link.free();
+         } finally {
+            unlock();
+         }
       }
    }
 

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpNonDurableReceiverTest.java

@@ -0,0 +1,81 @@
+/*
+ * 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.activemq.artemis.tests.integration.amqp;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.transport.amqp.client.AmqpClient;
+import org.apache.activemq.transport.amqp.client.AmqpConnection;
+import org.apache.activemq.transport.amqp.client.AmqpReceiver;
+import org.apache.activemq.transport.amqp.client.AmqpSession;
+import org.apache.activemq.transport.amqp.client.AmqpValidator;
+import org.junit.Test;
+
+import org.apache.qpid.proton.amqp.messaging.Terminus;
+import org.apache.qpid.proton.amqp.messaging.TerminusExpiryPolicy;
+import org.apache.qpid.proton.engine.Receiver;
+
+public class AmqpNonDurableReceiverTest extends AmqpClientTestSupport {
+
+   @Test(timeout = 60000)
+   public void testLinkDetachReleasesResources() throws Exception {
+
+      AmqpClient client = createAmqpClient();
+      AmqpConnection connection = addConnection(client.createConnection());
+      connection.connect();
+
+      AmqpSession session = connection.createSession();
+
+      SimpleString simpleTopicName = SimpleString.toSimpleString(getTopicName());
+      final int bindingsBefore = server.getPostOffice().getBindingsForAddress(simpleTopicName).getBindings().size();
+
+
+      AmqpReceiver receiver = session.createReceiver(getTopicName());
+
+      AtomicBoolean remoteLinkClosed = new AtomicBoolean();
+      assertEquals("Unexpected source expiry policy", TerminusExpiryPolicy.LINK_DETACH,
+                   ((Terminus) receiver.getEndpoint().getSource()).getExpiryPolicy());
+
+      receiver.setStateInspector(new AmqpValidator() {
+         @Override
+         public void inspectDetachedResource(final Receiver receiver) {
+            super.inspectDetachedResource(receiver);
+            fail("Remote link detached in unexpected manner");
+         }
+
+         @Override
+         public void inspectClosedResource(final Receiver receiver) {
+            super.inspectClosedResource(receiver);
+            remoteLinkClosed.set(true);
+         }
+      });
+
+      assertEquals("Unexpected number of bindings before attach",
+                   bindingsBefore + 1, server.getPostOffice().getBindingsForAddress(simpleTopicName).getBindings().size());
+
+      receiver.detach();
+
+      assertEquals("Unexpected number of bindings after detach",
+                   bindingsBefore,
+                   server.getPostOffice().getBindingsForAddress(simpleTopicName).getBindings().size());
+
+      assertTrue("Remote link was not closed", remoteLinkClosed.get());
+
+      receiver.getStateInspector().assertValid();
+   }
+}