From 47e8d27212126cf7e7b7aca8c241c5838674ed9a Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Wed, 7 Mar 2018 16:21:00 +1300 Subject: [PATCH] #1337 - Fix YamlLoader ... such that it loads multi-part yml source --- src/main/java/io/ebean/config/properties/YamlLoader.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/io/ebean/config/properties/YamlLoader.java b/src/main/java/io/ebean/config/properties/YamlLoader.java index 2c472b22b..b7157810e 100644 --- a/src/main/java/io/ebean/config/properties/YamlLoader.java +++ b/src/main/java/io/ebean/config/properties/YamlLoader.java @@ -21,9 +21,12 @@ class YamlLoader { this.loadContext = loadContext; } + @SuppressWarnings("unchecked") void load(InputStream is) { if (is != null) { - loadMap(yaml.load(is), null); + for (Object map : yaml.loadAll(is)) { + loadMap((Map)map, null); + } } }