(lucene) branch main updated: Fix OpenJ9 regression introduced by #12754

[us...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

uschindler pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/lucene.git


The following commit(s) were added to refs/heads/main by this push:
     new 5358b7251ec Fix OpenJ9 regression introduced by #12754
5358b7251ec is described below

commit 5358b7251ec264f78a8b3c5250f5082b4756f6ca
Author: Uwe Schindler <us...@apache.org>
AuthorDate: Sun Nov 5 10:53:49 2023 +0100

    Fix OpenJ9 regression introduced by #12754
---
 lucene/core/src/java/org/apache/lucene/util/RamUsageEstimator.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lucene/core/src/java/org/apache/lucene/util/RamUsageEstimator.java b/lucene/core/src/java/org/apache/lucene/util/RamUsageEstimator.java
index 7e0bdfdee84..e9941c7251e 100644
--- a/lucene/core/src/java/org/apache/lucene/util/RamUsageEstimator.java
+++ b/lucene/core/src/java/org/apache/lucene/util/RamUsageEstimator.java
@@ -112,10 +112,10 @@ public final class RamUsageEstimator {
 
   /** Initialize constants and try to collect information about the JVM internals. */
   static {
-    if (Constants.JRE_IS_64BIT && HotspotVMOptions.IS_HOTSPOT) {
+    if (Constants.JRE_IS_64BIT) {
+      JVM_IS_HOTSPOT_64BIT = HotspotVMOptions.IS_HOTSPOT;
       // Try to get compressed oops and object alignment (the default seems to be 8 on Hotspot);
       // (this only works on 64 bit, on 32 bits the alignment and reference size is fixed):
-      JVM_IS_HOTSPOT_64BIT = true;
       COMPRESSED_REFS_ENABLED =
           HotspotVMOptions.get("UseCompressedOops").map(Boolean::valueOf).orElse(false);
       NUM_BYTES_OBJECT_ALIGNMENT =