--- a/agent/ChangeLog	Mon May 18 00:47:53 2015 +0900
+++ b/agent/ChangeLog	Tue May 19 19:53:37 2015 +0900
@@ -1,3 +1,7 @@
+2015-05-19 KUBOTA Yuji  <kubota.yuji@lab.ntt.co.jp>
+
+	* Bug 2370: Change bugs.sun.com to bugs.openjdk.java.net
+
 2015-05-18 KUBOTA Yuji  <kubota.yuji@lab.ntt.co.jp>
 
 	* Bug 2366: Change the calculation of g1StartAddr to create the bitmap for G1GC

--- a/agent/src/jvmInfo.hpp	Mon May 18 00:47:53 2015 +0900
+++ b/agent/src/jvmInfo.hpp	Tue May 19 19:53:37 2015 +0900
@@ -363,8 +363,8 @@
     }
 
     /*!
-     * \brief Decision for 7046558: G1: concurrent marking optimizations.
-     * http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7046558
+     * \brief Decision for JDK-7046558: G1: concurrent marking optimizations.
+     * https://bugs.openjdk.java.net/browse/JDK-7046558
      * http://hg.openjdk.java.net/hsx/hotspot-gc/hotspot/rev/842b840e67db
      */
     inline bool isAfterCR7046558(void){
@@ -373,9 +373,9 @@
     }
 
     /*!
-     * \brief Decision for 6964458: Reimplement class meta-data storage to use native memory
+     * \brief Decision for JDK-6964458: Reimplement class meta-data storage to use native memory
      *        (PermGen Removal)
-     * http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6964458
+     * https://bugs.openjdk.java.net/browse/JDK-6964458
      * http://hg.openjdk.java.net/hsx/hotspot-rt-gate/hotspot/rev/da91efe96a93
      */
     inline bool isAfterCR6964458(void){
@@ -384,8 +384,8 @@
     }
 
     /*!
-     * \brief Decision for CR8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
-     * http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=8000213
+     * \brief Decision for JDK-8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
+     * https://bugs.openjdk.java.net/browse/JDK-8000213
      * http://hg.openjdk.java.net/hsx/hotspot-rt/hotspot/rev/d8ce2825b193
      */
     inline bool isAfterCR8000213(void){
@@ -394,8 +394,8 @@
     }
 
     /*!
-     * \brief Decision for 8003424: Enable Class Data Sharing for CompressedOops
-     * http://bugs.sun.com/view_bug.do?bug_id=8003424
+     * \brief Decision for JDK-8003424: Enable Class Data Sharing for CompressedOops
+     * https://bugs.openjdk.java.net/browse/JDK-8003424
      * http://hg.openjdk.java.net/hsx/hotspot-rt/hotspot/rev/740e263c80c6
      */
     inline bool isAfterCR8003424(void){
@@ -404,7 +404,7 @@
     }
 
     /*!
-     * \brief Decision for 8015107: NPG: Use consistent naming for metaspace concepts
+     * \brief Decision for JDK-8015107: NPG: Use consistent naming for metaspace concepts
      * https://bugs.openjdk.java.net/browse/JDK-8015107
      */
     inline bool isAfterCR8015107(void){
@@ -414,6 +414,7 @@
 
     /*!
      * \brief Decision for JDK-8027746: Remove do_gen_barrier template parameter in G1ParCopyClosure
+     * https://bugs.openjdk.java.net/browse/JDK-8027746
      */
     inline bool isAfterCR8027746(void){
       // hs25.20-b02
@@ -422,6 +423,7 @@
 
     /*!
      * \brief Decision for JDK-8049421: G1 Class Unloading after completing a concurrent mark cycle
+     * https://bugs.openjdk.java.net/browse/JDK-8049421
      */
     inline bool isAfterCR8049421(void){
       // hs25.40-b05

--- a/agent/src/oopUtil.cpp	Mon May 18 00:47:53 2015 +0900
+++ b/agent/src/oopUtil.cpp	Tue May 19 19:53:37 2015 +0900
@@ -1676,7 +1676,7 @@
     /*
      * See 6990754:
      * Use native memory and reference counting to implement SymbolTable.
-     * http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6990754
+     * https://bugs.openjdk.java.net/browse/JDK-6990754
      * http://hg.openjdk.java.net/hsx/hotspot-rt-gate/hotspot/rev/3582bf76420e
      */
     {"symbolOopDesc", "_length", &ofsLengthAtSymbol, NULL},