Merge
authordsamersoff
Wed, 09 Nov 2016 08:45:51 +0000
changeset 42550 fd77566dddd3
parent 42548 5ba95648287f (diff)
parent 42549 154099b110df (current diff)
child 42551 11422f6d92b3
Merge
--- a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HSDB.java	Wed Nov 09 10:56:32 2016 +0300
+++ b/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HSDB.java	Wed Nov 09 08:45:51 2016 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1474,7 +1474,7 @@
                   return attached;
               }
               public void attach(String pid) {
-                  attach(pid);
+                  HSDB.this.attach(pid);
               }
               public void attach(String java, String core) {
               }