meow

Author: eggrobin

unicodetools/src/main/java/org/unicode/text/utility/Utility.java

@@ -1451,20 +1451,13 @@ public static String getMostRecentUnicodeDataFile(
             if (version != null && version.compareTo(currentVersion) < compValue) {
                 continue;
             }
-            if (version != null && currentVersion.compareTo(version) < 0) {
-                if (version.compareTo(VersionInfo.UNICODE_4_1) >= 0) {
-                    // Do not look at earlier versions if we want Unicode 4.1 data or later.
-                    // Unicode 4.0.1 is the last version for which unmodified files were not
-                    // republished.
-                    return null;
-                } else {
-                    // Even back when files were not republished, we copy them.
-                    throw new IllegalStateException(
-                            "File "
-                                    + filename
-                                    + " should be copied to version directory "
-                                    + version);
-                }
+            if (version != null
+                    && currentVersion.compareTo(version) < 0
+                    && version.compareTo(VersionInfo.UNICODE_4_1) >= 0) {
+                // Do not look at earlier versions if we want Unicode 4.1 data or later.
+                // Unicode 4.0.1 is the last version for which unmodified files were not
+                // republished.
+                return null;
             }
             // check the standard ucd directory
             if (filename.contains("/*/")) {
@@ -1496,6 +1489,14 @@ public static String getMostRecentUnicodeDataFile(
                 // TODO: Consider generally switching from using File to using the newer Path.
                 result = searchDirectory(path.toFile(), filename, show, fileType);
                 if (result != null) {
+                    if (version != null && currentVersion.compareTo(version) < 0) {
+                        // Even back when files were not republished, we copy them.
+                        throw new IllegalStateException(
+                                "File "
+                                        + filename
+                                        + " should be copied to version directory "
+                                        + version);
+                    }
                     break;
                 }
             }