Merge pull request #10630 from igfoo/igfoo/ver0

igfoo · web-flow · commit 9be2ca2f1ed3 · 2022-09-30T10:52:42.000+01:00
Kotlin: Make newerThan symmetric
diff --git a/java/kotlin-extractor/src/main/java/com/semmle/extractor/java/OdasaOutput.java b/java/kotlin-extractor/src/main/java/com/semmle/extractor/java/OdasaOutput.java
@@ -509,9 +509,9 @@ private boolean newerThan(TrapClassVersion tcv) {
 			// Classes being compiled from source have major version 0 but should take precedence
 			// over any classes with the same qualified name loaded from the classpath
 			// in previous or subsequent extractor invocations.
-			if (tcv.majorVersion==0)
+			if (tcv.majorVersion == 0 && majorVersion != 0)
 				return false;
-			else if (majorVersion==0)
+			else if (majorVersion == 0 && tcv.majorVersion != 0)
 				return true;
 			// Always consider the Kotlin extractor superior to the Java extractor, because we may decode and extract
 			// Kotlin metadata that the Java extractor can't understand:
