Skip to content

Commit bb721fa

Browse files
author
ehennum
committed
other cases to skip retry on multistatement transaction #1038
1 parent a34d44e commit bb721fa

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

marklogic-client-api/src/main/java/com/marklogic/client/impl/OkHttpServices.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1360,7 +1360,7 @@ private TemporalDescriptor putPostDocumentImpl(RequestLogger reqlog, String meth
13601360
status = response.code();
13611361

13621362
responseHeaders = response.headers();
1363-
if (!retryStatus.contains(status)) {
1363+
if (transaction != null || !retryStatus.contains(status)) {
13641364
if (isFirstRequest()) setFirstRequest(false);
13651365

13661366
break;
@@ -1504,7 +1504,7 @@ private TemporalDescriptor putPostDocumentImpl(RequestLogger reqlog, String meth
15041504
status = response.code();
15051505

15061506
responseHeaders = response.headers();
1507-
if (!retryStatus.contains(status)) {
1507+
if (transaction != null || !retryStatus.contains(status)) {
15081508
if (isFirstRequest()) setFirstRequest(false);
15091509

15101510
break;
@@ -2207,7 +2207,7 @@ Response getResponse() {
22072207

22082208
status = response.code();
22092209

2210-
if (!retryStatus.contains(status)) {
2210+
if (transaction != null || !retryStatus.contains(status)) {
22112211
if (isFirstRequest()) setFirstRequest(false);
22122212

22132213
break;
@@ -3162,7 +3162,7 @@ public <R extends AbstractReadHandle, W extends AbstractWriteHandle> R putResour
31623162
response = doPut(requestBldr, multiPart, hasStreamingPart);
31633163
status = response.code();
31643164

3165-
if (!retryStatus.contains(status)) {
3165+
if (transaction != null || !retryStatus.contains(status)) {
31663166
if (isFirstRequest()) setFirstRequest(false);
31673167

31683168
break;
@@ -3334,7 +3334,7 @@ public <R extends AbstractReadHandle, W extends AbstractWriteHandle> R postResou
33343334
response = doPost(requestBldr, multiPart, hasStreamingPart);
33353335
status = response.code();
33363336

3337-
if (!retryStatus.contains(status)) {
3337+
if (transaction != null || !retryStatus.contains(status)) {
33383338
if (isFirstRequest()) setFirstRequest(false);
33393339

33403340
break;
@@ -3859,7 +3859,7 @@ private <W extends AbstractWriteHandle, U extends OkHttpResultIterator> U postIt
38593859
response = doPost(requestBldr, multiPart, hasStreamingPart);
38603860
status = response.code();
38613861

3862-
if (!retryStatus.contains(status)) {
3862+
if (transaction != null || !retryStatus.contains(status)) {
38633863
if (isFirstRequest()) setFirstRequest(false);
38643864

38653865
break;

0 commit comments

Comments
 (0)