activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtu...@apache.org
Subject svn commit: r771718 - in /activemq/trunk/activemq-core/src: main/java/org/apache/activemq/state/ConnectionState.java test/java/org/apache/activemq/broker/ConcurrentConnectSimulationTest.java
Date Tue, 05 May 2009 13:28:51 GMT
Author: gtully
Date: Tue May  5 13:28:51 2009
New Revision: 771718

URL: http://svn.apache.org/viewvc?rev=771718&view=rev
Log:
resolve https://issues.apache.org/activemq/browse/AMQ-2241 - ensure default session is created
for a duplicate connection request

Added:
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ConcurrentConnectSimulationTest.java
  (with props)
Modified:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/state/ConnectionState.java

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/state/ConnectionState.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/state/ConnectionState.java?rev=771718&r1=771717&r2=771718&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/state/ConnectionState.java
(original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/state/ConnectionState.java
Tue May  5 13:28:51 2009
@@ -57,6 +57,8 @@
         sessions.clear();
         tempDestinations.clear();
         shutdown.set(false);
+        // Add the default session id.
+        addSession(new SessionInfo(info, -1));
     }
 
     public void addTempDestination(DestinationInfo info) {

Added: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ConcurrentConnectSimulationTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ConcurrentConnectSimulationTest.java?rev=771718&view=auto
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ConcurrentConnectSimulationTest.java
(added)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ConcurrentConnectSimulationTest.java
Tue May  5 13:28:51 2009
@@ -0,0 +1,59 @@
+/**
+ * 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.broker;
+
+import junit.framework.Test;
+
+import org.apache.activemq.advisory.AdvisorySupport;
+import org.apache.activemq.command.ConnectionInfo;
+import org.apache.activemq.command.ConsumerId;
+import org.apache.activemq.command.ConsumerInfo;
+import org.apache.activemq.command.SessionId;
+
+public class ConcurrentConnectSimulationTest extends BrokerTestSupport {
+
+    /*
+     * simulate failover and retry of connection before broker has killed connection
+     * which appears as a concurrent connect request to the broker
+     * see: https://issues.apache.org/activemq/browse/AMQ-2241
+     */
+    public void testConcurrentConnection() throws Exception {
+
+        StubConnection connection1 = createConnection();
+        StubConnection connection2 = createConnection();
+        
+        // reuse same connection info
+        ConnectionInfo connectionInfo = createConnectionInfo();       
+        connection1.request(connectionInfo);
+        connection2.request(connectionInfo);
+        
+        // second one should win out, verify using consumer on default session (watchAdvisories)
+        ConsumerId consumerId = new ConsumerId(new SessionId(connectionInfo.getConnectionId(),
-1), 1);
+        ConsumerInfo consumerInfo = new ConsumerInfo(consumerId);
+        consumerInfo.setDestination(AdvisorySupport.TEMP_DESTINATION_COMPOSITE_ADVISORY_TOPIC);
+
+        connection2.request(consumerInfo);
+    }
+    
+    public static Test suite() {
+        return suite(ConcurrentConnectSimulationTest.class);
+    }
+
+    public static void main(String[] args) {
+        junit.textui.TestRunner.run(suite());
+    }
+}

Propchange: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ConcurrentConnectSimulationTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ConcurrentConnectSimulationTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date



Mime
View raw message