commit f40efd14aa032cef948f1fdc2ceea771faf4a9df
author Treehugger Robot <treehugger-gerrit@google.com> Mon Jul 24 12:42:54 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jul 24 12:42:54 2017 +0000
tree 0530e8968cfef789f07970fc4b5891bbecc07bb2
parent ad76ef641d8570affb2e3c728b40876c4ed53fac
parent 3988af6473bf3005da0af13ea7bdcbcb6d187313

Merge "Show diff column for fields only if diff is enabled."

tools/ahat/src/ObjectHandler.java

diff --git a/tools/ahat/src/ObjectHandler.java b/tools/ahat/src/ObjectHandler.java
index cc55b7a..8262910 100644
--- a/tools/ahat/src/ObjectHandler.java
+++ b/tools/ahat/src/ObjectHandler.java
@@ -110,7 +110,7 @@
   private static void printClassInstanceFields(Doc doc, Query query, AhatClassInstance inst) {
     doc.section("Fields");
     AhatInstance base = inst.getBaseline();
-    printFields(doc, query, INSTANCE_FIELDS_ID, !base.isPlaceHolder(),
+    printFields(doc, query, INSTANCE_FIELDS_ID, inst != base && !base.isPlaceHolder(),
         inst.asClassInstance().getInstanceFields(),
         base.isPlaceHolder() ? null : base.asClassInstance().getInstanceFields());
   }
@@ -211,7 +211,7 @@
 
     doc.section("Static Fields");
     AhatInstance base = clsobj.getBaseline();
-    printFields(doc, query, STATIC_FIELDS_ID, !base.isPlaceHolder(),
+    printFields(doc, query, STATIC_FIELDS_ID, clsobj != base && !base.isPlaceHolder(),
         clsobj.getStaticFieldValues(),
         base.isPlaceHolder() ? null : base.asClassObj().getStaticFieldValues());
   }