fix #75

apache · May 20, 2016 · 4695545 · 4695545
1 parent a366df1
commit 4695545
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/sharding-jdbc-doc/content/post/release_notes.md b/sharding-jdbc-doc/content/post/release_notes.md
@@ -27,6 +27,7 @@ weight = 1
 1. [ISSUE #65](https://github.com/dangdangdotcom/sharding-jdbc/issues/65) 解析条件上下文性能提升
 1. [ISSUE #67](https://github.com/dangdangdotcom/sharding-jdbc/issues/67) 分片路由到多表时柔性事务日志无法删除
 1. [ISSUE #71](https://github.com/dangdangdotcom/sharding-jdbc/issues/71) 路由单分片LIMIT的OFFSET计算错误
+1. [ISSUE #75](https://github.com/dangdangdotcom/sharding-jdbc/issues/75) MemoryTransactionLogStorage重试次数更新并发问题
 
 ## 1.2.0
 

diff --git a/sharding-jdbc-doc/content/post/roadmap.md b/sharding-jdbc-doc/content/post/roadmap.md
@@ -15,7 +15,7 @@ weight = 11
 
 ### config 2.0
 1. 动态表配置 `(完成)`
-1. 简化只分库配置，无需配置逻辑表和真实表对应关系
+1. 简化只分库配置，无需配置逻辑表和真实表对应关系 `(完成)`
 1. 简化只分表配置，可指定默认数据源,简化单库TableRule配置
 
 ## 计划中

diff --git a/...a/com/dangdang/ddframe/rdb/transaction/soft/storage/impl/MemoryTransactionLogStorage.java b/...a/com/dangdang/ddframe/rdb/transaction/soft/storage/impl/MemoryTransactionLogStorage.java
@@ -17,15 +17,16 @@
 
 package com.dangdang.ddframe.rdb.transaction.soft.storage.impl;
 
+import com.dangdang.ddframe.rdb.transaction.soft.constants.SoftTransactionType;
 import com.dangdang.ddframe.rdb.transaction.soft.storage.TransactionLog;
 import com.dangdang.ddframe.rdb.transaction.soft.storage.TransactionLogStorage;
-import com.dangdang.ddframe.rdb.transaction.soft.constants.SoftTransactionType;
 import lombok.RequiredArgsConstructor;
 
 import java.sql.Connection;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * 基于内存的事务日志存储器接口.
@@ -69,7 +70,7 @@ public List<TransactionLog> findEligibleTransactionLogs(final int size, final in
     public void increaseAsyncDeliveryTryTimes(final String id) {
         if (DATA.containsKey(id)) {
             TransactionLog transactionLog = DATA.get(id);
-            transactionLog.setAsyncDeliveryTryTimes(transactionLog.getAsyncDeliveryTryTimes() + 1);
+            transactionLog.setAsyncDeliveryTryTimes(new AtomicInteger(transactionLog.getAsyncDeliveryTryTimes()).incrementAndGet());
             DATA.put(id, transactionLog);
         }
     }