You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2016/11/02 10:49:30 UTC
lucene-solr:branch_6x: LUCENE-7135: only use OS_ARCH if we couldn't
access sun.arch.data.model
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 35f3cd9bd -> 97c978380
LUCENE-7135: only use OS_ARCH if we couldn't access sun.arch.data.model
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/97c97838
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/97c97838
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/97c97838
Branch: refs/heads/branch_6x
Commit: 97c97838022efcac8ccbcffb5edf5735605fdf17
Parents: 35f3cd9
Author: Mike McCandless <mi...@apache.org>
Authored: Wed Nov 2 06:48:29 2016 -0400
Committer: Mike McCandless <mi...@apache.org>
Committed: Wed Nov 2 06:49:19 2016 -0400
----------------------------------------------------------------------
.../core/src/java/org/apache/lucene/util/Constants.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/97c97838/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 @@ public final class Constants {
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;
}