From ea5e9fa75a333c94d28051fbe8229507a7b5ff4c Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Mon, 31 Oct 2016 20:15:23 +1300
Subject: [PATCH] #842 - For @DbJson map the type Map<String, ?> (using the
 wildcard) ... the same as Map<String, Object>

---
 .../com/avaje/ebeaninternal/server/type/DefaultTypeManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/DefaultTypeManager.java b/src/main/java/com/avaje/ebeaninternal/server/type/DefaultTypeManager.java
index 53e754ad1..c299d45e1 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/type/DefaultTypeManager.java
@@ -484,7 +484,7 @@ public final class DefaultTypeManager implements TypeManager, KnownImmutable {
    */
   private boolean isMapValueTypeObject(Type genericType) {
     Type[] typeArgs = ((ParameterizedType) genericType).getActualTypeArguments();
-    return Object.class.equals(typeArgs[1]);
+    return Object.class.equals(typeArgs[1]) || "?".equals(typeArgs[1].toString());
   }
 
   private ScalarType<?> createJsonObjectMapperType(Class<?> type, Type genericType, int dbType, DocPropertyType docType) {