diff --git a/CHANGES.txt b/CHANGES.txt index 6ad16741e9..a162aeb70a 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 4.0 + * Upgrade the jna version to 4.3.0 (CASSANDRA-13300) * Add the currentTimestamp, currentDate, currentTime and currentTimeUUID functions (CASSANDRA-13132) * Remove config option index_interval (CASSANDRA-10671) * Reduce lock contention for collection types and serializers (CASSANDRA-13271) diff --git a/lib/jna-4.0.0.jar b/lib/jna-4.0.0.jar deleted file mode 100644 index 9038048dc2..0000000000 Binary files a/lib/jna-4.0.0.jar and /dev/null differ diff --git a/lib/jna-4.3.0.jar b/lib/jna-4.3.0.jar new file mode 100644 index 0000000000..713354e593 Binary files /dev/null and b/lib/jna-4.3.0.jar differ diff --git a/lib/licenses/jna-4.0.0.txt b/lib/licenses/jna-4.3.0.txt similarity index 100% rename from lib/licenses/jna-4.0.0.txt rename to lib/licenses/jna-4.3.0.txt diff --git a/src/java/org/apache/cassandra/utils/CLibrary.java b/src/java/org/apache/cassandra/utils/CLibrary.java index ae3ce63fad..8824b9a4e8 100644 --- a/src/java/org/apache/cassandra/utils/CLibrary.java +++ b/src/java/org/apache/cassandra/utils/CLibrary.java @@ -126,11 +126,15 @@ public final class CLibrary private static OSType getOsType() { String osName = System.getProperty("os.name").toLowerCase(); - if (osName.contains("mac")) + if (osName.contains("linux")) + return LINUX; + else if (osName.contains("mac")) return MAC; else if (osName.contains("windows")) return WINDOWS; - else if (osName.contains("aix")) + + logger.warn("the current operating system, {}, is unsupported by cassandra", osName); + if (osName.contains("aix")) return AIX; else // fall back to the Linux impl for all unknown OS types until otherwise implicitly supported as needed