From 78317e1efacc56aee2f48d732d4af85bd9ffe0b1 Mon Sep 17 00:00:00 2001 From: ulion Date: Sat, 9 Apr 2016 15:58:04 +0800 Subject: Fix new api java<->json conversion problem #1859 --- src/org/traccar/web/WebServer.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/org/traccar/web/WebServer.java b/src/org/traccar/web/WebServer.java index ba98c1b03..973f6a0a5 100644 --- a/src/org/traccar/web/WebServer.java +++ b/src/org/traccar/web/WebServer.java @@ -32,6 +32,7 @@ import org.eclipse.jetty.server.session.HashSessionManager; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.webapp.WebAppContext; +import org.glassfish.jersey.jackson.JacksonFeature; import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.servlet.ServletContainer; import org.traccar.Config; @@ -138,6 +139,7 @@ public class WebServer { ResourceConfig resourceConfig = new ResourceConfig(); resourceConfig.register(ObjectMapperProvider.class); + resourceConfig.register(JacksonFeature.class); resourceConfig.register(ResourceErrorHandler.class); resourceConfig.register(SecurityRequestFilter.class); resourceConfig.register(CorsResponseFilter.class); -- cgit v1.2.3