commit a66a44513ee8191e25b477372094bfa846450316
author Mike McCandless <mikemccand@apache.org> Wed Nov 02 06:48:29 2016 -0400
committer Mike McCandless <mikemccand@apache.org> Wed Nov 02 06:49:34 2016 -0400
tree a43a2868cc37ffd449b8430627d58a3dc189b5b2
parent 650de1e6b50b9f9260ec2bb1044640328d2e4e27

LUCENE-7135: only use OS_ARCH if we couldn't access sun.arch.data.model

lucene/core/src/java/org/apache/lucene/util/Constants.java

diff --git a/lucene/core/src/java/org/apache/lucene/util/Constants.java b/lucene/core/src/java/org/apache/lucene/util/Constants.java
index e6a9609..007ef85 100644
--- a/lucene/core/src/java/org/apache/lucene/util/Constants.java
+++ b/lucene/core/src/java/org/apache/lucene/util/Constants.java
@@ -75,10 +75,12 @@
         is64Bit = datamodel.contains("64");
       }
     } catch (SecurityException ex) {}
-    if (datamodel == null && OS_ARCH != null && OS_ARCH.contains("64")) {
-      is64Bit = true;
-    } else {
-      is64Bit = false;
+    if (datamodel == null) {
+      if (OS_ARCH != null && OS_ARCH.contains("64")) {
+        is64Bit = true;
+      } else {
+        is64Bit = false;
+      }
     }
     JRE_IS_64BIT = is64Bit;
   }