Revert changes to RabbitUtils

Author: artembilan

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/RabbitUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -229,18 +229,12 @@ public static void setPhysicalCloseRequired(Channel channel, boolean b) {
 	public static boolean isPhysicalCloseRequired() {
 		Boolean mustClose = physicalCloseRequired.get();
 		if (mustClose == null) {
-			return false;
+			mustClose = Boolean.FALSE;
 		}
 		else {
-			return mustClose;
+			physicalCloseRequired.remove();
 		}
-	}
-
-	/**
-	 * Clear the physicalCloseRequired flag.
-	 */
-	public static void clearPhysicalCloseRequired() {
-		physicalCloseRequired.remove();
+		return mustClose;
 	}
 
 	/**

spring-rabbit/src/test/java/org/springframework/amqp/rabbit/connection/ClientRecoveryCompatibilityTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,7 +43,6 @@ public class ClientRecoveryCompatibilityTests {
 
 	@Test
 	public void testDefeatRecovery() throws Exception {
-		RabbitUtils.clearPhysicalCloseRequired(); // left over from some other test
 		final Channel channel1 = mock(Channel.class);
 		when(channel1.isOpen()).thenReturn(true);
 		final Channel channel2 = mock(Channel.class);
@@ -75,7 +74,7 @@ public void testDefeatRecovery() throws Exception {
 		Connection conn3 = ccf.createConnection();
 		assertThat(conn3).isSameAs(conn1);
 		assertThatExceptionOfType(AutoRecoverConnectionNotCurrentlyOpenException.class).isThrownBy(() ->
-					conn3.createChannel(false))
+				conn3.createChannel(false))
 				.withMessage("Auto recovery connection is not currently open");
 		channel = conn2.createChannel(false);
 		proxy = (ChannelProxy) channel;