Fix build breaks

Signed-off-by: Peter Nied <[email protected]>
peternied · Jan 5, 2024 · cb8d8a7 · cb8d8a7
1 parent 2d5a169
commit cb8d8a7
Showing 1 changed file with 1 addition and 24 deletions.
diff --git a/src/main/java/org/opensearch/security/configuration/ConfigurationRepository.java b/src/main/java/org/opensearch/security/configuration/ConfigurationRepository.java
@@ -138,7 +138,7 @@ private void initalizeClusterConfiguration(final boolean installDefaultConfig) {
                     String lookupDir = System.getProperty("security.default_init.dir");
                     final String cd = lookupDir != null
                         ? (lookupDir + "/")
-                        : new Environment(settings, configPath).configDir().toAbsolutePath().toString() + "/opensearch-security/";
+                        : new Environment(settings, configPath).configFile().toAbsolutePath().toString() + "/opensearch-security/";
                     File confFile = new File(cd + "config.yml");
                     if (confFile.exists()) {
                         final ThreadContext threadContext = threadPool.getThreadContext();
@@ -514,27 +514,4 @@ private static String formatDate(long date) {
     public static int getDefaultConfigVersion() {
         return ConfigurationRepository.DEFAULT_CONFIG_VERSION;
     }
-<<<<<<< HEAD
-=======
-
-    private class AccessControllerWrappedThread extends Thread {
-        private final Thread innerThread;
-
-        public AccessControllerWrappedThread(Thread innerThread) {
-            this.innerThread = innerThread;
-        }
-
-        @Override
-        public void run() {
-            AccessController.doPrivileged(new PrivilegedAction<Void>() {
-
-                @Override
-                public Void run() {
-                    innerThread.run();
-                    return null;
-                }
-            });
-        }
-    }
->>>>>>> 045d4ef8a (Allow TransportConfigUpdateAction when security config initialization has completed (#3810))
 }