fixes #1499

svn changeset:4060/svn branch:trunk

diff --git a/src/com/itmill/toolkit/service/FileTypeResolver.java b/src/com/itmill/toolkit/service/FileTypeResolver.java
index 79aadf899ff0d64e797dc159c0806c701ebaf338..277e4327497336d16c3bfce67e6237bcba22c595 100644 (file)
--- a/src/com/itmill/toolkit/service/FileTypeResolver.java
+++ b/src/com/itmill/toolkit/service/FileTypeResolver.java
@@ -315,14 +315,14 @@ public class FileTypeResolver {
             throw new NullPointerException("File can not be null");
         }
 
-        // Drives
-        if (file.getParentFile() == null) {
-            return "inode/drive";
-        }
-
         // Directories
         if (file.isDirectory()) {
-            return "inode/directory";
+            // Drives
+            if (file.getParentFile() == null) {
+                return "inode/drive";
+            } else {
+                return "inode/directory";
+            }
         }
 
         // Return type from extension