Merge pull request #11163 from rmuir/jna_nosys

Use our provided JNA library, versus one installed on the system
This commit is contained in:
Robert Muir 2015-05-14 09:03:05 -04:00
commit 1d3a8ad36a
3 changed files with 4 additions and 0 deletions

Binary file not shown.

View File

@ -68,3 +68,6 @@ JAVA_OPTS="$JAVA_OPTS -XX:+DisableExplicitGC"
# Ensure UTF-8 encoding by default (e.g. filenames) # Ensure UTF-8 encoding by default (e.g. filenames)
JAVA_OPTS="$JAVA_OPTS -Dfile.encoding=UTF-8" JAVA_OPTS="$JAVA_OPTS -Dfile.encoding=UTF-8"
# Use our provided JNA always versus the system one
JAVA_OPTS="$JAVA_OPTS -Djna.nosys=true"

View File

@ -469,6 +469,7 @@
<argument>-XX:+HeapDumpOnOutOfMemoryError</argument> <argument>-XX:+HeapDumpOnOutOfMemoryError</argument>
<argument>-XX:+DisableExplicitGC</argument> <argument>-XX:+DisableExplicitGC</argument>
<argument>-Dfile.encoding=UTF-8</argument> <argument>-Dfile.encoding=UTF-8</argument>
<argument>-Djna.nosys=true</argument>
<argument>-Delasticsearch</argument> <argument>-Delasticsearch</argument>
</arguments> </arguments>
</configuration> </configuration>