[servicecomb-pack] 42/42: SCB-1368 Added null protection logic

[ningjiang]

This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git

commit ed6fa9d4beb24c2dfab448f0be6dd53aed9caa56
Author: Lei Zhang <coolbee...@gmail.com>
AuthorDate: Sun Sep 29 09:54:20 2019 +0800

    SCB-1368 Added null protection logic
---
 .../pack/alpha/server/fsm/FsmSagaDataController.java  | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git 
a/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/fsm/FsmSagaDataController.java
 
b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/fsm/FsmSagaDataController.java
index bd4d07d..0d51671 100644
--- 
a/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/fsm/FsmSagaDataController.java
+++ 
b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/fsm/FsmSagaDataController.java
@@ -56,15 +56,16 @@ class FsmSagaDataController {
     LOG.info("Get the events request");
     List<Map> eventVos = new LinkedList<>();
     SagaData data = 
SagaDataExtension.SAGA_DATA_EXTENSION_PROVIDER.get(system).getLastSagaData();
-    data.getEvents().forEach(event -> {
-      Map<String,String> obj = new HashMap();
-      obj.put("serviceName",event.getServiceName());
-      obj.put("type",event.getClass().getSimpleName());
-      eventVos.add(obj);
-    });
-    LOG.info("Get the event size {}",eventVos.size());
-    LOG.info("Get the event data {}",eventVos);
-
+    if (data != null && data.getEvents() != null) {
+      data.getEvents().forEach(event -> {
+        Map<String, String> obj = new HashMap();
+        obj.put("serviceName", event.getServiceName());
+        obj.put("type", event.getClass().getSimpleName());
+        eventVos.add(obj);
+      });
+      LOG.info("Get the event size {}", eventVos.size());
+      LOG.info("Get the event data {}", eventVos);
+    }
     return ResponseEntity.ok(eventVos);
   }