Skip to content

Commit 1bf5958

Browse files
committed
MLE-27481 Polaris fixes
1 parent 46d1b40 commit 1bf5958

File tree

1 file changed

+15
-10
lines changed

1 file changed

+15
-10
lines changed

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

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2643,7 +2643,7 @@ private void putPostValueImpl(RequestLogger reqlog, String method,
26432643

26442644
Object nextValue = (handle != null) ? handle.sendContent() : value;
26452645

2646-
RequestBody sentValue = null;
2646+
RequestBody sentValue;
26472647
if (nextValue instanceof OutputStreamSender) {
26482648
sentValue = new StreamingOutputImpl(
26492649
(OutputStreamSender) nextValue, reqlog, mediaType);
@@ -2676,9 +2676,7 @@ private void putPostValueImpl(RequestLogger reqlog, String method,
26762676
requestBldr = addTelemetryAgentId(requestBldr);
26772677
}
26782678

2679-
response = (sentValue == null) ?
2680-
sendRequestOnce(requestBldr.put(null).build()) :
2681-
sendRequestOnce(requestBldr.put(sentValue).build());
2679+
response = sendRequestOnce(requestBldr.put(sentValue).build());
26822680
} else if ("post".equals(method)) {
26832681
if (requestBldr == null) {
26842682
connectPath = type;
@@ -2688,9 +2686,7 @@ private void putPostValueImpl(RequestLogger reqlog, String method,
26882686
requestBldr = addTelemetryAgentId(requestBldr);
26892687
}
26902688

2691-
response = (sentValue == null) ?
2692-
sendRequestOnce(requestBldr.post(RequestBody.create("", null)).build()) :
2693-
sendRequestOnce(requestBldr.post(sentValue).build());
2689+
response = sendRequestOnce(requestBldr.post(sentValue).build());
26942690
} else {
26952691
throw new MarkLogicInternalException("unknown method type "
26962692
+ method);
@@ -2950,7 +2946,10 @@ public Response apply(Request.Builder funcBuilder) {
29502946

29512947
updateDescriptor(outputBase, response.headers());
29522948
if (as != null) {
2953-
outputBase.receiveContent(makeResult(reqlog, "read", "resource", response, as));
2949+
Object result = makeResult(reqlog, "read", "resource", response, as);
2950+
if (result != null) {
2951+
outputBase.receiveContent(result);
2952+
}
29542953
} else {
29552954
closeResponse(response);
29562955
}
@@ -3035,7 +3034,10 @@ public Response apply(Request.Builder funcBuilder) {
30353034
ResponseStatus.OK_OR_CREATED_OR_NO_CONTENT);
30363035

30373036
if (as != null) {
3038-
outputBase.receiveContent(makeResult(reqlog, "write", "resource", response, as));
3037+
Object result = makeResult(reqlog, "write", "resource", response, as);
3038+
if (result != null) {
3039+
outputBase.receiveContent(result);
3040+
}
30393041
} else {
30403042
closeResponse(response);
30413043
}
@@ -3903,7 +3905,10 @@ public Response apply(Request.Builder funcBuilder) {
39033905
ResponseStatus.OK_OR_NO_CONTENT);
39043906

39053907
if (as != null) {
3906-
outputBase.receiveContent(makeResult(reqlog, "delete", "resource", response, as));
3908+
Object result = makeResult(reqlog, "delete", "resource", response, as);
3909+
if (result != null) {
3910+
outputBase.receiveContent(result);
3911+
}
39073912
} else {
39083913
closeResponse(response);
39093914
}

0 commit comments

Comments
 (0)