Merge pull request #29 from gradle/lptr/require-explicit-init

Require explicit call to FileEvents.init()
gradle · Jan 14, 2025 · 54a3393 · 54a3393
2 parents 0450ef4 + 12d47e9
commit 54a3393
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/main/java/org/gradle/fileevents/FileEvents.java b/src/main/java/org/gradle/fileevents/FileEvents.java
@@ -20,10 +20,14 @@
 @ThreadSafe
 public class FileEvents {
     private static final Map<Class<?>, Object> integrations = new HashMap<>();
+    private static boolean initialized;
 
     @ThreadSafe
     static public void init(File extractDir) throws NativeException {
         synchronized (FileEvents.class) {
+            if (initialized) {
+                return;
+            }
             Platform platform = Platform.current();
             String platformName = getPlatformName(platform);
             try {
@@ -33,6 +37,7 @@ static public void init(File extractDir) throws NativeException {
                     throw new NativeIntegrationUnavailableException(String.format("Native file events integration is not available for %s.", platform));
                 }
                 System.load(library.getCanonicalPath());
+                initialized = true;
 
                 String nativeVersion = AbstractNativeFileEventFunctions.getVersion();
                 if (!nativeVersion.equals(FileEventsVersion.VERSION)) {
@@ -115,8 +120,10 @@ private static boolean isLinuxWithMusl() {
     @ThreadSafe
     public static <T extends NativeIntegration> T get(Class<T> type)
         throws NativeIntegrationUnavailableException, NativeException {
-        init(null);
         synchronized (FileEvents.class) {
+            if (!initialized) {
+                throw new NativeException(String.format("File-system watching native library has not been initialized.", type.getSimpleName()));
+            }
             Platform platform = Platform.current();
             Object instance = integrations.get(type);
             if (instance == null) {

diff --git a/src/test/groovy/org/gradle/fileevents/internal/AbstractFileEventFunctionsTest.groovy b/src/test/groovy/org/gradle/fileevents/internal/AbstractFileEventFunctionsTest.groovy
@@ -84,6 +84,8 @@ abstract class AbstractFileEventFunctionsTest extends Specification {
         assert rootDir.mkdirs()
         uncaughtFailureOnThread = []
         expectedLogMessages = [:]
+
+        FileEvents.init(null)
     }
 
     def cleanup() {