Merge branch '2.4.x' into 2.5.x

See gh-28134
spring-projects · Oct 1, 2021 · d238566 · d238566
2 parents 1c139b1 + a732933
commit d238566
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/...configure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java b/...configure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java
@@ -1111,14 +1111,15 @@ private String parseVirtualHost(String input) {
 		}
 
 		private void parseHostAndPort(String input, boolean sslEnabled) {
-			int portIndex = input.lastIndexOf(':');
-			if (portIndex == -1) {
+			int bracketIndex = input.lastIndexOf(']');
+			int colonIndex = input.lastIndexOf(':');
+			if (colonIndex == -1 || colonIndex < bracketIndex) {
 				this.host = input;
 				this.port = (determineSslEnabled(sslEnabled)) ? DEFAULT_PORT_SECURE : DEFAULT_PORT;
 			}
 			else {
-				this.host = input.substring(0, portIndex);
-				this.port = Integer.parseInt(input.substring(portIndex + 1));
+				this.host = input.substring(0, colonIndex);
+				this.port = Integer.parseInt(input.substring(colonIndex + 1));
 			}
 		}
 

diff --git a/...gure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitPropertiesTests.java b/...gure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitPropertiesTests.java
@@ -242,7 +242,14 @@ void customAddresses() {
 
 	@Test
 	void ipv6Address() {
-		this.properties.setAddresses("amqp://foo:bar@[aaaa:bbbb:cccc::d]:5672");
+		this.properties.setAddresses("amqp://foo:bar@[aaaa:bbbb:cccc::d]:1234");
+		assertThat(this.properties.determineHost()).isEqualTo("[aaaa:bbbb:cccc::d]");
+		assertThat(this.properties.determinePort()).isEqualTo(1234);
+	}
+
+	@Test
+	void ipv6AddressDefaultPort() {
+		this.properties.setAddresses("amqp://foo:bar@[aaaa:bbbb:cccc::d]");
 		assertThat(this.properties.determineHost()).isEqualTo("[aaaa:bbbb:cccc::d]");
 		assertThat(this.properties.determinePort()).isEqualTo(5672);
 	}