Index: forgon-tools/src/main/java/com/forgon/system/concurrent/service/OptimisticLockInterceptor.java =================================================================== diff -u -r25091 -r40500 --- forgon-tools/src/main/java/com/forgon/system/concurrent/service/OptimisticLockInterceptor.java (.../OptimisticLockInterceptor.java) (revision 25091) +++ forgon-tools/src/main/java/com/forgon/system/concurrent/service/OptimisticLockInterceptor.java (.../OptimisticLockInterceptor.java) (revision 40500) @@ -52,7 +52,8 @@ .getCurrentTransactionStatus(); TransactionInfo transactionInfo = null; boolean bind = false; - if (transactionStatus != null && transactionStatus.isNewTransaction()) { + //Docker启动项目时,transactionInfoManager可能为空 原因尚不明确 会导致初始化数据时serialNumber修改不成功 + if (transactionInfoManager != null && transactionStatus != null && transactionStatus.isNewTransaction()) { transactionInfo = new TransactionInfo(invocation,transactionStatus); transactionInfoManager.addTransactionInfo(transactionInfo); transactionInfo.bindToThread(); @@ -72,7 +73,7 @@ try { rv = invocation.proceed(); } finally { - if(transactionInfo != null){ + if(transactionInfoManager != null && transactionInfo != null){ transactionInfoManager.removeTransactionInfo(transactionInfo); } if (bind) {