# HG changeset patch
# User tpivovarova
# Date 1454949849 0
# Node ID 2207cea1d26db708a5c62f6bd8b02a37082ae849
# Parent  f327d6231b16fde693187eb47fb0dcdc9a90e4d4# Parent  8905c66b5fce9fc6a8ee948aaec852993bbc218b
Merge

diff -r 8905c66b5fce -r 2207cea1d26d hotspot/src/share/vm/compiler/disassembler.hpp
--- a/hotspot/src/share/vm/compiler/disassembler.hpp	Fri Feb 05 21:16:14 2016 +0300
+++ b/hotspot/src/share/vm/compiler/disassembler.hpp	Mon Feb 08 16:44:09 2016 +0000
@@ -85,6 +85,7 @@
 
  public:
   static bool can_decode() {
+    ttyLocker tl;
     return (_decode_instructions_virtual != NULL) ||
            (_decode_instructions != NULL) ||
            load_library();