From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Mon, 17 Mar 2008 12:52:19 +0000 (+0000)
Subject: fixes #1499
X-Git-Tag: 6.7.0.beta1~4926
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=86a4d4d3dca1e4a026d61bd0fd1f8b8a483a81f3;p=vaadin-framework.git

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 79aadf899f..277e432749 100644
--- 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