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

mdalp · Nov 2, 2016 · a66a445 · a66a445
1 parent 650de1e
commit a66a445
Showing 1 changed file with 6 additions and 4 deletions.
diff --git 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 @@ private Constants() {}  // can't construct
         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;
   }