| commit | e63aae8ecd57543bcf99f18ecf92af8c18979d0a | [log] [tgz] |
|---|---|---|
| author | Michael Blow <michael.blow@couchbase.com> | Wed Nov 22 14:47:30 2023 -0500 |
| committer | Michael Blow <michael.blow@couchbase.com> | Wed Nov 22 14:47:30 2023 -0500 |
| tree | 5079e3a31f8143341d9a346ac3c0ec07013b0ff9 | |
| parent | b2449e9b6dfd35dadac938f83963aab3b8b41622 [diff] | |
| parent | f4e9d0ae7168483f7b2ef6128e8cc4c201096c10 [diff] |
Merge branch 'gerrit/neo' into 'gerrit/trinity' Change-Id: I85d179137d831069f67a5f6f8a401608b9e05e85
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java index f28579d..c57cc3b 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java
@@ -439,6 +439,7 @@ LOGGER.warn(() -> "handleException: " + ex.getMessage() + ": " + LogRedactionUtil.userData(param.toString())); executionState.setStatus(ResultStatus.FATAL, HttpResponseStatus.SERVICE_UNAVAILABLE); + return true; default: // fall-through }
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveEntityEventsListener.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveEntityEventsListener.java index 3fd339e..626b938 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveEntityEventsListener.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveEntityEventsListener.java
@@ -691,7 +691,7 @@ @Override public synchronized void replace(Dataset dataset) { - if (getDatasets().contains(dataset)) { + if (getDatasets().remove(dataset)) { getDatasets().remove(dataset); getDatasets().add(dataset); }