diff options
author | Arne H Juul <arnej27959@users.noreply.github.com> | 2023-03-23 14:01:07 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-23 14:01:07 +0100 |
commit | 15974a4e47bdca54150e191daf91d8c090629e30 (patch) | |
tree | 50f428db718a83c2a7caf9b928069da7504d5030 /config-model/src/main | |
parent | 7cb105d478b9d6c0139aa55ac6cb148196baa2f8 (diff) | |
parent | 0b047cc682e5091b072244269ff8b44f735e5050 (diff) |
Merge pull request #26547 from vespa-engine/arnej/improve-failure-for-self-referencing-functions
improve error for cycle in ranking expression functions
Diffstat (limited to 'config-model/src/main')
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/derived/DerivedConfiguration.java | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/derived/RankProfileList.java | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/config-model/src/main/java/com/yahoo/schema/derived/DerivedConfiguration.java b/config-model/src/main/java/com/yahoo/schema/derived/DerivedConfiguration.java index 8b07aa48a24..e64f625bdf4 100644 --- a/config-model/src/main/java/com/yahoo/schema/derived/DerivedConfiguration.java +++ b/config-model/src/main/java/com/yahoo/schema/derived/DerivedConfiguration.java @@ -88,7 +88,7 @@ public class DerivedConfiguration implements AttributesConfig.Producer { } Validation.validate(this, schema); } - catch (IllegalArgumentException e) { + catch (IllegalArgumentException|IllegalStateException e) { throw new IllegalArgumentException("Invalid " + schema, e); } } diff --git a/config-model/src/main/java/com/yahoo/schema/derived/RankProfileList.java b/config-model/src/main/java/com/yahoo/schema/derived/RankProfileList.java index a50ddd4aeea..ac7495d09c7 100644 --- a/config-model/src/main/java/com/yahoo/schema/derived/RankProfileList.java +++ b/config-model/src/main/java/com/yahoo/schema/derived/RankProfileList.java @@ -127,8 +127,9 @@ public class RankProfileList extends Derived implements RankProfilesConfig.Produ throw new IllegalStateException(e); } catch (ExecutionException e) { - throw e.getCause() instanceof IllegalArgumentException ? (IllegalArgumentException)e.getCause() - : new IllegalStateException(e); + if (e.getCause() instanceof IllegalArgumentException iArg) throw iArg; + if (e.getCause() instanceof IllegalStateException iState) throw iState; + throw new IllegalStateException(e); } } |