Merge pull request #26547 from vespa-engine/arnej/improve-failure-for-self-referencing-functions

improve error for cycle in ranking expression functions

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);
         }
     }