From 26d3dac2bcd7f8a794593cb6c9711ba21a9b2b59 Mon Sep 17 00:00:00 2001 From: cwl-0514 <980697938@qq.com> Date: Tue, 31 Jul 2018 21:41:03 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=88=86=E6=94=AF?= =?UTF-8?q?=E7=9A=84=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/exmple/thread/demo/Demo.java | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 src/com/exmple/thread/demo/Demo.java diff --git a/src/com/exmple/thread/demo/Demo.java b/src/com/exmple/thread/demo/Demo.java new file mode 100644 index 0000000..f66dcb6 --- /dev/null +++ b/src/com/exmple/thread/demo/Demo.java @@ -0,0 +1,10 @@ +package com.exmple.thread.demo; + +/** + * Created by cwl on 2018/7/31. + */ +public class Demo { + public static void main(String[] args){ + System.out.println("测试分支用的"); + } +} From beca44e905a802b3c9163bf3856341550e177503 Mon Sep 17 00:00:00 2001 From: cwl-0514 <980697938@qq.com> Date: Tue, 31 Jul 2018 21:44:48 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=88=86=E6=94=AF?= =?UTF-8?q?=E7=9A=84=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/exmple/service/ThreadA.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/com/exmple/service/ThreadA.java b/src/com/exmple/service/ThreadA.java index 72d01d8..14f5a32 100644 --- a/src/com/exmple/service/ThreadA.java +++ b/src/com/exmple/service/ThreadA.java @@ -18,5 +18,6 @@ public ThreadA(HasSelfPrivateNum numRef) { public void run() { super.run(); numRef.addI("a"); + System.out.println("测试分支合并"); } } From c3c68ecbf793169b0aa85b9083c4fde5082bea22 Mon Sep 17 00:00:00 2001 From: cwl-0514 <980697938@qq.com> Date: Tue, 31 Jul 2018 21:45:09 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=88=86=E6=94=AF?= =?UTF-8?q?=E7=9A=84=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/exmple/thread/notice/MyList.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/com/exmple/thread/notice/MyList.java b/src/com/exmple/thread/notice/MyList.java index 23546d2..a61952b 100644 --- a/src/com/exmple/thread/notice/MyList.java +++ b/src/com/exmple/thread/notice/MyList.java @@ -13,6 +13,7 @@ public class MyList { public void add(){ list.add("陈文龙"); + System.out.println("测试分支合并"); } public int sized(){ return list.size();