CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 28 Packages Projects Releases Wiki Activity

Merge pull request #580 from mohitsinha/batchfix

Browse Source 
Fineract-759: Thread unsafe bug in batch transactions
This commit is contained in:
Vishwas Babu A J
2019-06-12 20:21:55 -07:00
committed by GitHub
parent 02d51b115a 48687a3103
commit 4bc82a20fe
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-provider/src/main/java/org/apache/fineract/batch/service/BatchApiServiceImpl.java
+5 -9
View File
@@ -63,7 +63,6 @@ public class BatchApiServiceImpl implements BatchApiService {
private final CommandStrategyProvider strategyProvider; private final CommandStrategyProvider strategyProvider;
private final ResolutionHelper resolutionHelper; private final ResolutionHelper resolutionHelper;
private final TransactionTemplate transactionTemplate; private final TransactionTemplate transactionTemplate;
private List<BatchResponse> checkList = new ArrayList<>();
/** /**
* Constructs a 'BatchApiServiceImpl' with an argument of * Constructs a 'BatchApiServiceImpl' with an argument of
@@ -95,7 +94,6 @@ public class BatchApiServiceImpl implements BatchApiService {
final List<BatchResponse> responseList = new ArrayList<>(requestList.size()); final List<BatchResponse> responseList = new ArrayList<>(requestList.size());
final List<BatchRequestNode> batchRequestNodes = this.resolutionHelper.getDependingRequests(requestList); final List<BatchRequestNode> batchRequestNodes = this.resolutionHelper.getDependingRequests(requestList);
checkList.clear();
if(batchRequestNodes.isEmpty()) { if(batchRequestNodes.isEmpty()) {
final BatchResponse response = new BatchResponse(); final BatchResponse response = new BatchResponse();
ErrorInfo ex = ErrorHandler.handler(new ClientDetailsNotFoundException()); ErrorInfo ex = ErrorHandler.handler(new ClientDetailsNotFoundException());
@@ -122,7 +120,6 @@ public class BatchApiServiceImpl implements BatchApiService {
} }
}); });
checkList = responseList;
return responseList; return responseList;
} }
@@ -183,14 +180,15 @@ public class BatchApiServiceImpl implements BatchApiService {
@Override @Override
public List<BatchResponse> handleBatchRequestsWithEnclosingTransaction(final List<BatchRequest> requestList, final UriInfo uriInfo) { public List<BatchResponse> handleBatchRequestsWithEnclosingTransaction(final List<BatchRequest> requestList, final UriInfo uriInfo) {
List<BatchResponse> responseList = new ArrayList<>();
try { try {
return this.transactionTemplate.execute(new TransactionCallback<List<BatchResponse>>() { return this.transactionTemplate.execute(new TransactionCallback<List<BatchResponse>>() {
@Override @Override
public List<BatchResponse> doInTransaction(TransactionStatus status) { public List<BatchResponse> doInTransaction(TransactionStatus status) {
try { try {
return handleBatchRequests(requestList, uriInfo); responseList.addAll(handleBatchRequests(requestList, uriInfo));
return responseList;
} catch (RuntimeException ex) { } catch (RuntimeException ex) {
ErrorInfo e = ErrorHandler.handler(ex); ErrorInfo e = ErrorHandler.handler(ex);
@@ -212,14 +210,13 @@ public class BatchApiServiceImpl implements BatchApiService {
BatchResponse errResponse = new BatchResponse(); BatchResponse errResponse = new BatchResponse();
errResponse.setStatusCode(e.getStatusCode()); errResponse.setStatusCode(e.getStatusCode());
for (BatchResponse res : checkList) { for (BatchResponse res : responseList) {
if (!res.getStatusCode().equals(200)) { if (!res.getStatusCode().equals(200)) {
errResponse.setBody("Transaction is being rolled back. First erroneous request: \n" + new Gson().toJson(res)); errResponse.setBody("Transaction is being rolled back. First erroneous request: \n" + new Gson().toJson(res));
break; break;
} }
} }
checkList.clear();
List<BatchResponse> errResponseList = new ArrayList<>(); List<BatchResponse> errResponseList = new ArrayList<>();
errResponseList.add(errResponse); errResponseList.add(errResponse);
@@ -229,13 +226,12 @@ public class BatchApiServiceImpl implements BatchApiService {
BatchResponse errResponse = new BatchResponse(); BatchResponse errResponse = new BatchResponse();
errResponse.setStatusCode(e.getStatusCode()); errResponse.setStatusCode(e.getStatusCode());
for (BatchResponse res : checkList) { for (BatchResponse res : responseList) {
if (!res.getStatusCode().equals(200)) { if (!res.getStatusCode().equals(200)) {
errResponse.setBody("Transaction is being rolled back. First erroneous request: \n" + new Gson().toJson(res)); errResponse.setBody("Transaction is being rolled back. First erroneous request: \n" + new Gson().toJson(res));
break; break;
} }
} }
checkList.clear();
List<BatchResponse> errResponseList = new ArrayList<>(); List<BatchResponse> errResponseList = new ArrayList<>();
errResponseList.add(errResponse); errResponseList.add(errResponse);