Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix for: https://issues.apache.org/jira/browse/AMQ-3673 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1234981 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Timothy A. Bish 2012-01-23 20:46:50 +00:00
parent 82a093b479
commit 1d52f3b53c
2 changed files with 170 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java
View File

@ -1175,21 +1175,36 @@ public class FailoverTransport implements CompositeTransport {
private boolean contains(URI newURI) {
boolean result = false;
try {
for (URI uri : uris) {
if (newURI.getPort() == uri.getPort()) {
InetAddress newAddr = InetAddress.getByName(newURI.getHost());
InetAddress addr = InetAddress.getByName(uri.getHost());
if (addr.equals(newAddr)) {
for (URI uri : uris) {
if (newURI.getPort() == uri.getPort()) {
InetAddress newAddr = null;
InetAddress addr = null;
try {
newAddr = InetAddress.getByName(newURI.getHost());
addr = InetAddress.getByName(uri.getHost());
} catch(IOException e) {
if (newAddr == null) {
LOG.error("Failed to Lookup INetAddress for URI[ " + newURI + " ] : " + e);
} else {
LOG.error("Failed to Lookup INetAddress for URI[ " + uri + " ] : " + e);
}
if (newURI.getHost().equalsIgnoreCase(uri.getHost())) {
result = true;
break;
} else {
continue;
}
}
if (addr.equals(newAddr)) {
result = true;
break;
}
}
} catch (IOException e) {
result = true;
LOG.error("Failed to verify URI " + newURI + " already known: " + e);
}
return result;
}

146
activemq-core/src/test/java/org/apache/activemq/transport/failover/FailoverTransportUriHandlingTest.java Normal file
View File

@ -0,0 +1,146 @@
/**
* 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.transport.failover;
import static org.junit.Assert.*;
import java.lang.reflect.Field;
import java.net.URI;
import java.util.Collection;
import org.apache.activemq.transport.failover.FailoverTransport;
import org.junit.Test;
public class FailoverTransportUriHandlingTest {
@Test
public void testFailoverTransportAddWithInitialUnknown() throws Exception {
FailoverTransport transport = new FailoverTransport();
final String initialUri = "tcp://no.existing.hostname:61616";
transport.add(false, initialUri);
String[] uriArray = new String[] {"tcp://127.0.0.2:61616",
"tcp://localhost:61616",
"tcp://localhost:61617"};
for(String uri : uriArray) {
transport.add(false, uri);
}
Collection<URI> uris = getRegisteredUrlsFromPrivateField(transport);
for(String uri : uriArray) {
assertTrue("Collection should contain: " + uri, uris.contains(new URI(uri)));
}
}
@Test
public void testFailoverTransportAddWithInitialKnown() throws Exception {
FailoverTransport transport = new FailoverTransport();
final String initialUri = "tcp://localhost:61616";
transport.add(false, initialUri);
String[] uriArray = new String[] {"tcp://127.0.0.2:61616",
"tcp://no.existing.hostname:61616",
"tcp://localhost:61617"};
for(String uri : uriArray) {
transport.add(false, uri);
}
Collection<URI> uris = getRegisteredUrlsFromPrivateField(transport);
for(String uri : uriArray) {
assertTrue("Collection should contain: " + uri, uris.contains(new URI(uri)));
}
}
@Test
public void testFailoverTransportAddWithPreventsDups() throws Exception {
FailoverTransport transport = new FailoverTransport();
final String initialUri = "tcp://localhost:61616";
transport.add(false, initialUri);
String[] uriArray = new String[] {"tcp://127.0.0.2:61616",
"tcp://localhost:61616",
"tcp://no.existing.hostname:61616",
"tcp://localhost:61617",
"tcp://127.0.0.1:61616"};
for(String uri : uriArray) {
transport.add(false, uri);
}
Collection<URI> uris = getRegisteredUrlsFromPrivateField(transport);
assertEquals(4, uris.size());
// Ensure even the unknowns get checked.
transport.add(false, "tcp://no.existing.hostname:61616");
uris = getRegisteredUrlsFromPrivateField(transport);
assertEquals(4, uris.size());
}
@Test
public void testFailoverTransportAddArray() throws Exception {
FailoverTransport transport = new FailoverTransport();
final String initialUri = "tcp://no.existing.hostname:61616";
transport.add(false, initialUri);
URI[] uriArray = new URI[] {new URI("tcp://127.0.0.2:61616"),
new URI("tcp://localhost:61616"),
new URI("tcp://localhost:61617")};
transport.add(false, uriArray);
Collection<URI> uris = getRegisteredUrlsFromPrivateField(transport);
for(URI uri : uriArray) {
assertTrue("Collection should contain: " + uri, uris.contains(uri));
}
assertEquals(4, uris.size());
// Ensure even the unknowns get checked.
transport.add(false, "tcp://no.existing.hostname:61616");
uris = getRegisteredUrlsFromPrivateField(transport);
assertEquals(4, uris.size());
transport.add(false, uriArray);
assertEquals(4, uris.size());
}
@SuppressWarnings("unchecked")
private Collection<URI> getRegisteredUrlsFromPrivateField(FailoverTransport failoverTransport) throws SecurityException, NoSuchFieldException, IllegalAccessException {
Field urisField = failoverTransport.getClass().getDeclaredField("uris");
urisField.setAccessible(true);
return (Collection<URI>) urisField.get(failoverTransport);
}
}