diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-04-09 22:15:57 +1200 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2016-04-09 22:15:57 +1200 |
| commit | 4ab7143ea7084b9397fb4a2e59fd9b62d4fe18c5 (patch) | |
| tree | c54644b6dd7a2328e2a5b70a54ec5d0ab9d371c8 /src/org/traccar/web | |
| parent | f0c990d0cfc727b25f5de4b1097864d4afadb9cb (diff) | |
| parent | 78317e1efacc56aee2f48d732d4af85bd9ffe0b1 (diff) | |
| download | trackermap-server-4ab7143ea7084b9397fb4a2e59fd9b62d4fe18c5.tar.gz trackermap-server-4ab7143ea7084b9397fb4a2e59fd9b62d4fe18c5.tar.bz2 trackermap-server-4ab7143ea7084b9397fb4a2e59fd9b62d4fe18c5.zip | |
Merge pull request #1860 from ulion/fix_message_body_writer_not_found_problem
Fix new api java json conversion
Diffstat (limited to 'src/org/traccar/web')
| -rw-r--r-- | src/org/traccar/web/WebServer.java | 2 |
1 files changed, 2 insertions, 0 deletions
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); |