Merge branch 'master' of github.com:hollischuang/toBeTopJavaer

hollis.zhl · hollis.zhl · commit ad12d2820aba · 2019-02-06T17:32:30.000+08:00
diff --git a/basics/jvm/jvm-memory-structure.md b/basics/jvm/jvm-memory-structure.md
@@ -7,10 +7,15 @@
 参考文章：
 
 [Java虚拟机的内存组成以及堆内存介绍][1] 
+
 [Java堆和栈看这篇就够][2] 
+
 [Java虚拟机的堆、栈、堆栈如何去理解？][3] 
+
 [Java 内存之方法区和运行时常量池][4] 
+
 [从0到1起步-跟我进入堆外内存的奇妙世界][5]
+
 [JVM内存结构 VS Java内存模型 VS Java对象模型][6]
 
 参考书籍：《深入理解Java虚拟机》
@@ -20,4 +25,4 @@
  [3]: https://www.zhihu.com/question/29833675
  [4]: https://mritd.me/2016/03/22/Java-%E5%86%85%E5%AD%98%E4%B9%8B%E6%96%B9%E6%B3%95%E5%8C%BA%E5%92%8C%E8%BF%90%E8%A1%8C%E6%97%B6%E5%B8%B8%E9%87%8F%E6%B1%A0/
  [5]: https://www.jianshu.com/p/50be08b54bee
- [6]: http://www.hollischuang.com/archives/2509
+ [6]: http://www.hollischuang.com/archives/2509
diff --git a/catalog/catalog.md b/catalog/catalog.md
@@ -12,9 +12,9 @@ Here We Go!
 
 [《成神之路-基础篇》JVM——JVM内存结构](/basics/jvm/jvm-memory-structure.md)
 
-[《成神之路-基础篇》JVM——Java内存模型](/basics/jvm/java-object-model.md)
+[《成神之路-基础篇》JVM——Java内存模型](/basics/jvm/java-memory-model.md)
 
-[《成神之路-基础篇》JVM——Java对象模型](/basics/jvm/java-memory-model.md)
+[《成神之路-基础篇》JVM——Java对象模型](/basics/jvm/java-object-model.md)
 
 [《成神之路-基础篇》JVM——HotSpot][5]
 
@@ -85,4 +85,4 @@ Here We Go!
  [23]: http://www.hollischuang.com/?s=Zookeeper
  [24]: http://www.hollischuang.com/archives/69
  [25]: http://www.hollischuang.com/archives/2846
- [26]: http://www.hollischuang.com/archives/category/%E7%BB%BC%E5%90%88%E5%BA%94%E7%94%A8/%E5%88%86%E5%B8%83%E5%BC%8F
+ [26]: http://www.hollischuang.com/archives/category/%E7%BB%BC%E5%90%88%E5%BA%94%E7%94%A8/%E5%88%86%E5%B8%83%E5%BC%8F
