* Iterate extensions of libraries or executables on Loader.load() in reverse to be consistent with properties overriding

Author: saudet

CHANGELOG.md

@@ -1,4 +1,5 @@
 
+ * Iterate extensions of libraries or executables on `Loader.load()` in reverse to be consistent with properties overriding
  * Allow prefixing library names with `:` to have `Loader` consider them as filenames with prefix and suffix already included
  * Add `Loader.loadGlobal()` to load symbols globally as often required by Python libraries ([issue ContinuumIO/anaconda-issues#6401](https://github.com/ContinuumIO/anaconda-issues/issues/6401))
 

src/main/java/org/bytedeco/javacpp/ClassProperties.java

@@ -296,7 +296,10 @@ public void load(Class cls, boolean inherit) {
         addAll("platform.preload", preload);
         addAll("platform.resourcepath", resourcepath);
         addAll("platform.resource", resource);
-        addAll("platform.extension", extension);
+        if (platformExtension == null || platformExtension.length() == 0) {
+            // don't override the platform extension when found outside the class
+            addAll("platform.extension", extension);
+        }
         addAll("platform.executablepath", executablepath);
         setProperty("platform.executable", executable);
         setProperty("platform.library", library);

src/main/java/org/bytedeco/javacpp/Loader.java

@@ -1061,7 +1061,9 @@ public static String load(Class cls, Properties properties, boolean pathsFirst)
             String suffix = p.getProperty("platform.executable.suffix", "");
             String filename = prefix + executable + suffix;
             try {
-                for (String extension : Arrays.copyOf(extensions, extensions.length + 1)) {
+                for (int i = extensions.length - 1; i >= -1; i--) {
+                    // iterate extensions in reverse to be consistent with the overriding of properties
+                    String extension = i >= 0 ? extensions[i] : "";
                     String subdir = platform + (extension == null ? "" : extension) + "/";
                     File f = cacheResource(cls, subdir + filename);
                     if (f != null) {
@@ -1199,7 +1201,9 @@ public static URL[] findLibrary(Class cls, ClassProperties properties, String li
         ArrayList<URL> urls = new ArrayList<URL>(styles.length * (1 + paths.size()));
         for (int i = 0; cls != null && i < styles.length; i++) {
             // ... then find it from in our resources ...
-            for (String extension : Arrays.copyOf(extensions, extensions.length + 1)) {
+            for (int j = extensions.length - 1; j >= -1; j--) {
+                // iterate extensions in reverse to be consistent with the overriding of properties
+                String extension = j >= 0 ? extensions[j] : "";
                 for (String resource : Arrays.copyOf(resources, resources.length + 1)) {
                     if (resource != null && !resource.endsWith("/")) {
                         resource += "/";

src/test/java/org/bytedeco/javacpp/BuilderTest.java

@@ -72,7 +72,7 @@ public class BuilderTest implements BuildEnabled, LoadEnabled {
         assertEquals(0, outputFiles0.length);
 
         System.out.println("Builder");
-        Builder builder = new Builder().property("platform.extension", "-ext2").classesOrPackages(c.getName());
+        Builder builder = new Builder().property("platform.extension", "-ext1").classesOrPackages(c.getName());
         File[] outputFiles = builder.build();
 
         System.out.println("Loader");
@@ -86,24 +86,24 @@ public class BuilderTest implements BuildEnabled, LoadEnabled {
         Loader.loadProperties().remove("platform.extension");
         String filename = Loader.load(c);
         Loader.loadGlobal(filename);
-        assertTrue(Loader.getLoadedLibraries().get("jniBuilderTest").contains("-ext2"));
+        assertTrue(Loader.getLoadedLibraries().get("jniBuilderTest").contains("-ext1"));
         Loader.loadedLibraries.clear();
 
         System.out.println("Builder");
-        Builder builder2 = new Builder().property("platform.extension", "-ext1").classesOrPackages(c.getName());
+        Builder builder2 = new Builder().property("platform.extension", "-ext2").classesOrPackages(c.getName());
         File[] outputFiles2 = builder2.build();
 
         System.out.println("Loader");
         Loader.loadProperties().remove("platform.extension");
         filename = Loader.load(c);
         Loader.loadGlobal(filename);
-        assertTrue(Loader.getLoadedLibraries().get("jniBuilderTest").contains("-ext1"));
+        assertTrue(Loader.getLoadedLibraries().get("jniBuilderTest").contains("-ext2"));
         Loader.loadedLibraries.clear();
 
-        Loader.loadProperties().put("platform.extension", "-ext2");
+        Loader.loadProperties().put("platform.extension", "-ext1");
         filename = Loader.load(c);
         Loader.loadGlobal(filename);
-        assertTrue(Loader.getLoadedLibraries().get("jniBuilderTest").contains("-ext2"));
+        assertTrue(Loader.getLoadedLibraries().get("jniBuilderTest").contains("-ext1"));
 
         System.out.println(initCount);
         assertTrue(initCount >= 6);