diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployCreateProperties.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployCreateProperties.java index 40d754986..4534219e1 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployCreateProperties.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployCreateProperties.java @@ -376,7 +376,8 @@ public class DeployCreateProperties { if (typeArgs[0] instanceof Class){ return (Class) typeArgs[0]; } - throw new RuntimeException("Unexpected Parameterised Type? "+typeArgs[0]); + //throw new RuntimeException("Unexpected Parameterised Type? "+typeArgs[0]); + return null; } if (typeArgs.length == 2) { // this is probably a Map diff --git a/src/main/java/com/avaje/ebeaninternal/server/text/json/WriteJsonContext.java b/src/main/java/com/avaje/ebeaninternal/server/text/json/WriteJsonContext.java index d23bce5c9..61b656431 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/text/json/WriteJsonContext.java +++ b/src/main/java/com/avaje/ebeaninternal/server/text/json/WriteJsonContext.java @@ -71,25 +71,24 @@ public class WriteJsonContext implements JsonWriter { public void toJson(String name, Collection c) { - internalAppendKeyBegin(name); + beginAssocMany(name); Iterator it = c.iterator(); if (!it.hasNext()){ - buffer.append("[]"); + endAssocMany(); return; } Object o = it.next(); BeanDescriptor d = getDecriptor(o.getClass()); - appendArrayBegin(); d.jsonWrite(this, o); while (it.hasNext()) { appendComma(); Object t = it.next(); d.jsonWrite(this, t); } - appendArrayEnd(); + endAssocMany(); } private BeanDescriptor getDecriptor(Class cls) {