2 files changed, 7 insertions, 6 deletions
diff --git a/flags/src/main/java/com/yahoo/vespa/flags/JacksonArraySerializer.java b/flags/src/main/java/com/yahoo/vespa/flags/JacksonArraySerializer.java
index 619c0c51c17..5716582e0aa 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/JacksonArraySerializer.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/JacksonArraySerializer.java
@@ -16,6 +16,6 @@ public class JacksonArraySerializer<T> implements FlagSerializer<List<T>> {
 
     @Override
     public RawFlag serialize(List<T> value) {
-        return null;
+        return JsonNodeRawFlag.fromJacksonClass(value);
     }
 }
diff --git a/flags/src/test/java/com/yahoo/vespa/flags/FlagsTest.java b/flags/src/test/java/com/yahoo/vespa/flags/FlagsTest.java
index aa41cbbd94d..eccca6ccfde 100644
--- a/flags/src/test/java/com/yahoo/vespa/flags/FlagsTest.java
+++ b/flags/src/test/java/com/yahoo/vespa/flags/FlagsTest.java
@@ -106,14 +106,15 @@ public class FlagsTest {
                 defaultInstance, instance);
     }
 
-    private <T> void testGeneric(UnboundFlag<?, ?, ?> unboundFlag, T defaultValue, T value) {
+    private <T> void testGeneric(UnboundFlag<T, ?, ?> unboundFlag, T defaultValue, T value) {
         FlagSource source = mock(FlagSource.class);
-        Flag<?, ?> flag = unboundFlag.bindTo(source);
+        Flag<T, ?> flag = unboundFlag.bindTo(source);
 
-        when(source.fetch(any(), any())).thenReturn(Optional.empty());
-        assertThat(flag.boxedValue(), equalTo(defaultValue));
+        when(source.fetch(any(), any()))
+                .thenReturn(Optional.empty())
+                .thenReturn(Optional.of(flag.serializer().serialize(value)));
 
-        when(source.fetch(any(), any())).thenReturn(Optional.of(JsonNodeRawFlag.fromJacksonClass(value)));
+        assertThat(flag.boxedValue(), equalTo(defaultValue));
         assertThat(flag.boxedValue(), equalTo(value));
 
         assertTrue(Flags.getFlag(unboundFlag.id()).isPresent());