From b28e47e2045549de4ce8f9b2779f56d07f5703bd Mon Sep 17 00:00:00 2001 From: Bjørn Christian Seime Date: Tue, 27 Feb 2024 08:32:09 +0100 Subject: Ensure consistent global ordering --- container-core/src/main/java/com/yahoo/restapi/RestApiImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'container-core') diff --git a/container-core/src/main/java/com/yahoo/restapi/RestApiImpl.java b/container-core/src/main/java/com/yahoo/restapi/RestApiImpl.java index e5aeb33d45d..a69d46a95a2 100644 --- a/container-core/src/main/java/com/yahoo/restapi/RestApiImpl.java +++ b/container-core/src/main/java/com/yahoo/restapi/RestApiImpl.java @@ -214,7 +214,9 @@ class RestApiImpl implements RestApi { exceptionMappers.sort((l, r) -> { if (l.type.equals(r.type)) return 0; if (l.type.isAssignableFrom(r.type)) return 1; - return -1; + if (r.type.isAssignableFrom(l.type)) return -1; + // Ensure global ordering when no inheritance relationship exists + return l.type.getName().compareTo(r.type.getName()); }); return exceptionMappers; } -- cgit v1.2.3