# HG changeset patch
# User dholmes
# Date 1454033947 -3600
# Node ID fb46176bb4c61e99a4ff72c36ae62fd372f7f0ba
# Parent  accf9644fb73eaf20fa28bf8f571bbd2a5a17bb7# Parent  98c7219214dfa7a48b3987244f1b26516fddde9f
Merge

diff -r 98c7219214df -r fb46176bb4c6 hotspot/src/share/vm/oops/metadata.hpp
--- a/hotspot/src/share/vm/oops/metadata.hpp	Thu Jan 28 16:05:41 2016 -0500
+++ b/hotspot/src/share/vm/oops/metadata.hpp	Fri Jan 29 03:19:07 2016 +0100
@@ -58,13 +58,13 @@
     if (this == NULL)
       st->print("NULL");
     else
-      print_on(tty);
+      print_on(st);
   }
   void print_value_on_maybe_null(outputStream* st) const {
     if (this == NULL)
       st->print("NULL");
     else
-      print_value_on(tty);
+      print_value_on(st);
   }
 
   virtual void print_on(outputStream* st) const;       // First level print