| commit | 5b59ac75a131684e4098605cec7e70b9f5f49de1 | [log] [tgz] |
|---|---|---|
| author | Michael Blow <michael.blow@couchbase.com> | Wed Nov 22 21:24:21 2023 -0500 |
| committer | Michael Blow <michael.blow@couchbase.com> | Wed Nov 22 21:24:21 2023 -0500 |
| tree | 8ef95625fbebcb361a5acdb63d3e45d363ee3835 | |
| parent | 97172bf77c8f81041421b22ec5667b346dacd79c [diff] | |
| parent | e63aae8ecd57543bcf99f18ecf92af8c18979d0a [diff] |
Merge branch 'gerrit/trinity' into 'master' Change-Id: I79ce9134f8c358fd548f8b5425be391403a8d5f0
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 59b8bc8..63cd915 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
@@ -446,6 +446,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 8ef756f..e8926b8 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); }