Skip to content

MLE-32022 Avoid null pointer exception when FailedRequest is null #1972

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rjdew-progress wants to merge 1 commit into
base: develop
Choose a base branch
from
+18 −4
Open

MLE-32022 Avoid null pointer exception when FailedRequest is null #1972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions marklogic-client-api/src/main/java/com/marklogic/client/MarkLogicServerException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
/*
* Copyright (c) 2010-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
* Copyright (c) 2010-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
*/
package com.marklogic.client;

import com.marklogic.client.impl.FailedRequest;
import com.marklogic.client.impl.RESTServices;

/**
* Abstract class that implements functionality for errors returned from a MarkLogic REST API instance.
Expand Down Expand Up @@ -51,7 +52,7 @@ else if (failedRequest != null) {
* @return the status code
*/
public int getServerStatusCode() {
return (failedRequest == null) ? null : failedRequest.getStatusCode();
return (failedRequest == null) ? RESTServices.STATUS_UNKNOWN : failedRequest.getStatusCode();
}
/**
* Gets the HTTP status message (if any) associated with the error on the server.
Expand Down
3 changes: 2 additions & 1 deletion marklogic-client-api/src/main/java/com/marklogic/client/impl/RESTServices.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2010-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
* Copyright (c) 2010-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
*/
package com.marklogic.client.impl;

Expand Down Expand Up @@ -68,6 +68,7 @@ public interface RESTServices {
String MIMETYPE_APPLICATION_XML = "application/xml";
String MIMETYPE_MULTIPART_MIXED = "multipart/mixed";

int STATUS_UNKNOWN = -1;
int STATUS_OK = 200;
int STATUS_CREATED = 201;
int STATUS_NO_CONTENT = 204;
Expand Down
14 changes: 13 additions & 1 deletion marklogic-client-api/src/test/java/com/marklogic/client/test/FailedRequestTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
/*
* Copyright (c) 2010-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
* Copyright (c) 2010-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
*/
package com.marklogic.client.test;

import com.marklogic.client.*;
import com.marklogic.client.admin.QueryOptionsManager;
import com.marklogic.client.document.XMLDocumentManager;
import com.marklogic.client.impl.FailedRequest;
import com.marklogic.client.io.Format;
import com.marklogic.client.io.StringHandle;
import org.junit.jupiter.api.Test;
Expand Down Expand Up @@ -100,4 +101,15 @@ public void testFailedRequestParsing() {
fail("Call failed with unexpected exception: "+e.getMessage());
}
}

@Test
public void testNullFailedRequestInFailedRequestException() {
FailedRequestException e = new FailedRequestException("test", (FailedRequest) null);
assertEquals("test", e.getMessage());
assertEquals(-1, e.getServerStatusCode());
assertNull(e.getServerStatus());
assertNull(e.getServerMessageCode());
assertNull(e.getServerMessage());
assertNull(e.getServerStackTrace());
}
}
Loading