From 843489d272444a000ab32be9dc7ae1c715218345 Mon Sep 17 00:00:00 2001
From: 1181954449 <1181954449@qq.com>
Date: Wed, 28 Sep 2022 16:01:37 +0800
Subject: [PATCH] bugfix: output expression incorrectly throws npe (#4954)

---
 changes/en-us/develop.md                                         | 1 +
 changes/zh-cn/develop.md                                         | 1 +
 .../engine/pcext/interceptors/ServiceTaskHandlerInterceptor.java | 1 +
 3 files changed, 3 insertions(+)

diff --git a/changes/en-us/develop.md b/changes/en-us/develop.md
index 85efd8f340d..8fce4dc4d95 100644
--- a/changes/en-us/develop.md
+++ b/changes/en-us/develop.md
@@ -10,6 +10,7 @@ Add changes here for all PR submitted to the develop branch.
 
 
 ### bugfix:
+- [[#4954](https://github.com/seata/seata/pull/4954)] fix output expression incorrectly throws npe
 - [[#4817](https://github.com/seata/seata/pull/4817)] fix in high version springboot property not Standard
 - [[#4838](https://github.com/seata/seata/pull/4838)] fix when use Statement.executeBatch() can not generate undo log
 - [[#4779](https://github.com/seata/seata/pull/4779)] fix and support Apache Dubbo 3
diff --git a/changes/zh-cn/develop.md b/changes/zh-cn/develop.md
index b098c05d839..f5dae5d4399 100644
--- a/changes/zh-cn/develop.md
+++ b/changes/zh-cn/develop.md
@@ -10,6 +10,7 @@
 
 
 ### bugfix：
+- [[#4954](https://github.com/seata/seata/pull/4954)] 修复output表达式错误时，保存执行结果空指针异常
 - [[#4817](https://github.com/seata/seata/pull/4817)] 修复高版本springboot配置不标准的问题
 - [[#4838](https://github.com/seata/seata/pull/4838)] 修复使用 Statement.executeBatch() 时无法生成undo log 的问题
 - [[#4779](https://github.com/seata/seata/pull/4779)] 修复支持 Apache Dubbo 3 版本
diff --git a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/interceptors/ServiceTaskHandlerInterceptor.java b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/interceptors/ServiceTaskHandlerInterceptor.java
index 075e3d6353e..c17bb9ec2f7 100644
--- a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/interceptors/ServiceTaskHandlerInterceptor.java
+++ b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/interceptors/ServiceTaskHandlerInterceptor.java
@@ -264,6 +264,7 @@ public void postProcess(ProcessContext context, Exception exp) throws EngineExec
                 if (stateMachineInstance.getStateMachine().isPersist() && state.isPersist()
                     && stateMachineConfig.getStateLogStore() != null) {
 
+                    stateInstance.setGmtEnd(new Date());
                     stateMachineConfig.getStateLogStore().recordStateFinished(stateInstance, context);
                 }