[MMBASE SCM] r41006 - mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/util/magicfile

[michiel]

Author: michiel
Date: 2010-02-15 15:51:49 +0100 (Mon, 15 Feb 2010)
New Revision: 41006

Modified:
   
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/util/magicfile/MagicFile.java
Log:
  MMB-1935

Modified: 
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/util/magicfile/MagicFile.java
===================================================================
--- 
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/util/magicfile/MagicFile.java
      2010-02-15 14:46:55 UTC (rev 41005)
+++ 
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/util/magicfile/MagicFile.java
      2010-02-15 14:51:49 UTC (rev 41006)
@@ -77,11 +77,22 @@
      * @param file Location of file to be checked
      * @return Type of the file as determined by the magic file
      */
-    protected String getMimeType(File file) throws IOException {
+    public String getMimeType(File file) throws IOException {
         FileInputStream fir = null;
         try {
             fir = new FileInputStream(file);
-            return getMimeType(fir);
+            String result =  getMimeType(fir);
+            if (result == FAILED) {
+                String fileName = file.getName();
+                int i = fileName.lastIndexOf(".");
+                if (i > 0) {
+                    String  extension = fileName.substring(i + 1);
+                    if (extension.length() > 0) {
+                        result = extensionToMimeType(fileName.substring(i + 
1));
+                    }
+                }
+            }
+            return result;
         } finally {
             if (fir != null) {
                 fir.close();

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs