You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2016/12/29 19:33:16 UTC

lucene-solr:branch_6x: LUCENE-7595: Fix bug with RamUsageTester incorrectly handling Iterables outside Java Runtime

Repository: lucene-solr
Updated Branches:
  refs/heads/branch_6x e2aa2b638 -> 80512ec41


LUCENE-7595: Fix bug with RamUsageTester incorrectly handling Iterables outside Java Runtime


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/80512ec4
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/80512ec4
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/80512ec4

Branch: refs/heads/branch_6x
Commit: 80512ec412c20517341ddd50c78baf5270fcdc2f
Parents: e2aa2b6
Author: Uwe Schindler <us...@apache.org>
Authored: Thu Dec 29 20:31:47 2016 +0100
Committer: Uwe Schindler <us...@apache.org>
Committed: Thu Dec 29 20:32:54 2016 +0100

----------------------------------------------------------------------
 .../src/java/org/apache/lucene/util/RamUsageTester.java            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/80512ec4/lucene/test-framework/src/java/org/apache/lucene/util/RamUsageTester.java
----------------------------------------------------------------------
diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/RamUsageTester.java b/lucene/test-framework/src/java/org/apache/lucene/util/RamUsageTester.java
index daf81a9..6437d8e 100644
--- a/lucene/test-framework/src/java/org/apache/lucene/util/RamUsageTester.java
+++ b/lucene/test-framework/src/java/org/apache/lucene/util/RamUsageTester.java
@@ -152,7 +152,7 @@ public final class RamUsageTester {
           }
           
           boolean needsReflection = true;
-          if (Constants.JRE_IS_MINIMUM_JAVA9) {
+          if (Constants.JRE_IS_MINIMUM_JAVA9 && obClazz.getName().startsWith("java.")) {
             // Java 9: Best guess for some known types, as we cannot precisely look into runtime classes:
             final ToLongFunction<Object> func = SIMPLE_TYPES.get(obClazz);
             if (func != null) { // some simple type like String where the size is easy to get from public properties