From 43e935b2d5d80fb570cfe19972720a60ee028080 Mon Sep 17 00:00:00 2001
From: xiangwb <xiangwb@drore.com>
Date: Wed, 7 Feb 2018 17:59:08 +0800
Subject: [PATCH] merge

---
 .../src/main/java/com/xwbing/demo/CompletableFutureDemo.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/boot-service/src/main/java/com/xwbing/demo/CompletableFutureDemo.java b/boot-service/src/main/java/com/xwbing/demo/CompletableFutureDemo.java
index a2b03b1..34f70b6 100644
--- a/boot-service/src/main/java/com/xwbing/demo/CompletableFutureDemo.java
+++ b/boot-service/src/main/java/com/xwbing/demo/CompletableFutureDemo.java
@@ -39,7 +39,7 @@ public class CompletableFutureDemo {
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }
-            //出现异常
+            //出现异常,异常会被限制在执行任务的线程范围内
             if (1 == 1)
                 throw new RuntimeException("异常");
             return "world";
@@ -48,7 +48,7 @@ public class CompletableFutureDemo {
             object.put("s1", s1);
             object.put("s2", s2);
             return object;
-        }).exceptionally(e -> {
+        }).exceptionally(e -> {//捕获异常
             throw new RuntimeException(e.getMessage());
         }).join();
     }