diff options
Diffstat (limited to 'src/main/java/org/openslx/util/Json.java')
| -rw-r--r-- | src/main/java/org/openslx/util/Json.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/main/java/org/openslx/util/Json.java b/src/main/java/org/openslx/util/Json.java index f92bb58..5e5fbcb 100644 --- a/src/main/java/org/openslx/util/Json.java +++ b/src/main/java/org/openslx/util/Json.java @@ -8,7 +8,8 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicReference; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.thrift.TBase; import com.google.gson.Gson; @@ -25,7 +26,7 @@ import com.google.gson.JsonSyntaxException; public class Json { - private static final Logger LOGGER = Logger.getLogger(Json.class); + private static final Logger LOGGER = LogManager.getLogger(Json.class); /** * Global static instance. The Gson object is thread-safe. @@ -137,7 +138,7 @@ public class Json { if (element == null || element.isJsonNull()) continue; try { - field.setter.invoke(inst, context.deserialize(element, field.field.getType())); + field.setter.invoke(inst, new Object[] { context.deserialize(element, field.field.getType()) }); } catch (Exception e) { LOGGER.warn("Could not call " + field.setter.getName() + " on " + clazz.getSimpleName(), e); } |