Skip to content

Commit 3ed3aeb

Browse files
committed
MLE-26427 More Polaris fixes
1 parent 79887f0 commit 3ed3aeb

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

marklogic-client-api/src/main/java/com/marklogic/client/datamovement/filter/IncrementalWriteFilter.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,9 @@ protected final DocumentWriteSet filterDocuments(Context context, Function<Strin
188188

189189
private String serializeContent(DocumentWriteOperation doc) {
190190
String content = HandleAccessor.contentAsString(doc.getContent());
191+
if (content == null) {
192+
return null;
193+
}
191194

192195
Format format = null;
193196
if (doc.getContent() instanceof BaseHandle<?, ?> baseHandle) {

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5627,14 +5627,12 @@ private void executeRequest(CallResponseImpl responseImpl) {
56275627
};
56285628

56295629
Response response = sendRequestWithRetry(requestBldr, sendRequestFunction, resendableConsumer);
5630-
5630+
Objects.requireNonNull(response);
56315631
if (session != null) {
56325632
List<ClientCookie> cookies = new ArrayList<>();
5633-
if (response != null) {
5634-
for (String setCookie : response.headers(HEADER_SET_COOKIE)) {
5635-
ClientCookie cookie = parseClientCookie(requestBldr.build().url(), setCookie);
5636-
cookies.add(cookie);
5637-
}
5633+
for (String setCookie : response.headers(HEADER_SET_COOKIE)) {
5634+
ClientCookie cookie = parseClientCookie(requestBldr.build().url(), setCookie);
5635+
cookies.add(cookie);
56385636
}
56395637
((SessionStateImpl) session).setCookies(cookies);
56405638
}

0 commit comments

Comments
 (0)