Merge remote-tracking branch 'origin/master'

jossc · jossc · commit 807f12a59361 · 2019-07-21T20:29:03.000+08:00
diff --git a/src/main/java/com/concurrent/newstart/DeadLockDemon.java b/src/main/java/com/concurrent/newstart/DeadLockDemon.java
@@ -0,0 +1,40 @@
+package com.concurrent.newstart;
+
+/**
+ * @author by chenzhuo
+ * @Description 死锁
+ * @Date 2019/7/10 16:02
+ **/
+public class DeadLockDemon {
+    private static String A = "A";
+    private static String B = "B";
+
+    public static void main(String[] args) {
+        new DeadLockDemon().deadLock();
+    }
+
+    private void deadLock() {
+        Thread thread = new Thread(() -> {
+            synchronized (A) {
+                try {
+                    Thread.sleep(2000);
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+                synchronized (B) {
+                    System.err.println("B");
+                }
+            }
+
+        });
+        Thread thread1 = new Thread(() -> {
+            synchronized (B) {
+                synchronized (A) {
+                    System.err.println("A");
+                }
+            }
+        });
+        thread.start();
+        thread1.start();
+    }
+}
diff --git a/src/main/java/com/concurrent/newstart/package-info.java b/src/main/java/com/concurrent/newstart/package-info.java
@@ -0,0 +1,6 @@
+/**
+ * @Description 7.10~7.24 Java并发编程 整理输出
+ * @Date 2019/7/10 16:01
+ * @author by chenzhuo
+ **/
+package com.concurrent.newstart;
