GEODE-10337: add use of SocketCreatorFactory.close() (apache#7842)

* GEODE-10337: add use of SocketCreatorFactory.close() * GEODE-10337: added UT
jmelchio · Sep 7, 2022 · 596a601 · 596a601
1 parent dd485b2
commit 596a601
Show file tree

Hide file tree

Showing 3 changed files with 253 additions and 197 deletions.
diff --git a/...e-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java b/...e-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java
@@ -1642,6 +1642,7 @@ protected void disconnect(boolean preparingForReconnect, String reason, boolean
           removeSystem(this);
           if (!attemptingToReconnect) {
             loggingSession.shutdown();
+            SocketCreatorFactory.close();
           }
           alertingService.useAlertMessaging(new NullAlertMessaging());
           clusterAlertMessaging.get().close();

diff --git a/geode-core/src/main/java/org/apache/geode/internal/net/SocketCreatorFactory.java b/geode-core/src/main/java/org/apache/geode/internal/net/SocketCreatorFactory.java
@@ -54,10 +54,14 @@ private DistributionConfig getDistributionConfig() {
   }
 
   private static synchronized SocketCreatorFactory getInstance(boolean closing) {
-    if (instance == null && !closing) {
-      instance = new SocketCreatorFactory();
+    SocketCreatorFactory result = instance;
+    if (result == null && !closing) {
+      result = new SocketCreatorFactory();
+      instance = result;
+    } else if (result != null && closing) {
+      instance = null;
     }
-    return instance;
+    return result;
   }
 
   private static synchronized SocketCreatorFactory getInstance() {
@@ -74,6 +78,10 @@ public static SocketCreator getSocketCreatorForComponent(
         sslConfigForComponent);
   }
 
+  static boolean checkInstanceIsNull() {
+    return instance == null;
+  }
+
   public static SocketCreator getSocketCreatorForComponent(
       SecurableCommunicationChannel sslEnabledComponent) {
     return getSocketCreatorForComponent(getInstance().getDistributionConfig(), sslEnabledComponent);