3 files changed, 26 insertions, 25 deletions
diff --git a/src/org/traccar/Context.java b/src/org/traccar/Context.java
index 3681cc2cc..09e3c619b 100644
--- a/src/org/traccar/Context.java
+++ b/src/org/traccar/Context.java
@@ -337,9 +337,7 @@ public final class Context {
             ldapProvider = new LdapProvider(config);
         }
 
-        if (config.hasKey("media.path")) {
-            mediaManager = new MediaManager(config);
-        }
+        mediaManager = new MediaManager(config.getString("media.path"));
 
         if (dataManager != null) {
             usersManager = new UsersManager(dataManager);
diff --git a/src/org/traccar/database/MediaManager.java b/src/org/traccar/database/MediaManager.java
index 2c448a20c..482442735 100644
--- a/src/org/traccar/database/MediaManager.java
+++ b/src/org/traccar/database/MediaManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Anton Tananaev (anton@traccar.org)
+ * Copyright 2017 - 2018 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 package org.traccar.database;
 
 import org.jboss.netty.buffer.ChannelBuffer;
-import org.traccar.Config;
 import org.traccar.helper.Log;
 
 import java.io.File;
@@ -34,8 +33,8 @@ public class MediaManager {
 
     private String path;
 
-    public MediaManager(Config config) {
-        path = config.getString("media.path");
+    public MediaManager(String path) {
+        this.path = path;
     }
 
     private File createFile(String uniqueId, String name) throws IOException {
@@ -48,19 +47,21 @@ public class MediaManager {
     }
 
     public String writeFile(String uniqueId, ChannelBuffer buf, String extension) {
-        int size = buf.readableBytes();
-        String name = new SimpleDateFormat("yyyyMMddhhmmss").format(new Date()) + "." + extension;
-        try (FileOutputStream output = new FileOutputStream(createFile(uniqueId, name));
-                FileChannel fileChannel = output.getChannel()) {
-            ByteBuffer byteBuffer = buf.toByteBuffer();
-            int written = 0;
-            while (written < size) {
-                written += fileChannel.write(byteBuffer);
+        if (path != null) {
+            int size = buf.readableBytes();
+            String name = new SimpleDateFormat("yyyyMMddhhmmss").format(new Date()) + "." + extension;
+            try (FileOutputStream output = new FileOutputStream(createFile(uniqueId, name));
+                    FileChannel fileChannel = output.getChannel()) {
+                ByteBuffer byteBuffer = buf.toByteBuffer();
+                int written = 0;
+                while (written < size) {
+                    written += fileChannel.write(byteBuffer);
+                }
+                fileChannel.force(false);
+                return name;
+            } catch (IOException e) {
+                Log.warning(e);
             }
-            fileChannel.force(false);
-            return name;
-        } catch (IOException e) {
-            Log.warning(e);
         }
         return null;
     }
diff --git a/src/org/traccar/web/WebServer.java b/src/org/traccar/web/WebServer.java
index 88b38c1ab..06894552d 100644
--- a/src/org/traccar/web/WebServer.java
+++ b/src/org/traccar/web/WebServer.java
@@ -167,12 +167,14 @@ public class WebServer {
 
         servletHandler.addServlet(new ServletHolder(new AsyncSocketServlet()), "/socket");
 
-        ServletHolder servletHolder = new ServletHolder("media", DefaultServlet.class);
-        servletHolder.setInitParameter("resourceBase", config.getString("media.path"));
-        servletHolder.setInitParameter("dirAllowed", config.getString("media.directoryAllow", "false"));
-        servletHolder.setInitParameter("pathInfoOnly", "true");
-        servletHandler.addServlet(servletHolder, "/media/*");
-        servletHandler.addFilter(MediaFilter.class, "/media/*", EnumSet.allOf(DispatcherType.class));
+        if (config.hasKey("media.path")) {
+            ServletHolder servletHolder = new ServletHolder("media", DefaultServlet.class);
+            servletHolder.setInitParameter("resourceBase", config.getString("media.path"));
+            servletHolder.setInitParameter("dirAllowed", config.getString("media.directoryAllow", "false"));
+            servletHolder.setInitParameter("pathInfoOnly", "true");
+            servletHandler.addServlet(servletHolder, "/media/*");
+            servletHandler.addFilter(MediaFilter.class, "/media/*", EnumSet.allOf(DispatcherType.class));
+        }
 
         ResourceConfig resourceConfig = new ResourceConfig();
         resourceConfig.registerClasses(JacksonFeature.class, ObjectMapperProvider.class, ResourceErrorHandler.class);