tweak init

Terracotta-OSS · Oct 21, 2024 · 28e8222 · 28e8222
1 parent c0ca785
commit 28e8222
Showing 1 changed file with 3 additions and 8 deletions.
diff --git a/tc-server/src/main/java/com/tc/config/ServerConfigurationManager.java b/tc-server/src/main/java/com/tc/config/ServerConfigurationManager.java
@@ -77,10 +77,7 @@ public ProductInfo getProductInfo() {
   }
 
   public void initialize() throws ConfigurationException {
-    Lock lock = this.configurationProvider.lockAndInitialize(this.startUpArgs);
-
-    try {
-      Configuration configuration = configurationProvider.getConfiguration();
+    try (LockedConfiguration configuration = this.configurationProvider.lockAndInitialize(this.startUpArgs)) {
       if (configuration == null) {
         throw new ConfigurationException("unable to determine server configuration");
       }
@@ -92,8 +89,6 @@ public void initialize() throws ConfigurationException {
       thisServer = new StableServerConfiguration(base);
 
       processTcProperties(configuration.getTcProperties());
-    } finally {
-      lock.unlock();
     }
   }
 
@@ -300,10 +295,10 @@ List<ServerConfiguration> getStableServerConfigurations() {
       }
     }
 
-    Lock lockAndInitialize(List<String> configurationParams) throws ConfigurationException {
+    LockedConfiguration lockAndInitialize(List<String> configurationParams) throws ConfigurationException {
       lock.lock();
       initialize(configurationParams);
-      return lock;
+      return new LockedConfiguration(delegateProvider.getConfiguration(), lock);
     }
 
     @Override