From ad52c26c750f279111c7592d303418b6e87245f7 Mon Sep 17 00:00:00 2001 From: mark_o Date: Thu, 20 Mar 2008 13:48:40 +0000 Subject: [PATCH] [ 1914483 ] MimeType recognition fails with uppercase FileExt Solution provided by Tobi42 (Tobias Schoeneberg). --- base/src/org/compiere/util/MimeType.java | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/base/src/org/compiere/util/MimeType.java b/base/src/org/compiere/util/MimeType.java index 3aa314f3bc..a89399487f 100644 --- a/base/src/org/compiere/util/MimeType.java +++ b/base/src/org/compiere/util/MimeType.java @@ -37,13 +37,17 @@ public class MimeType return BINARY; // String extension = fileName.substring(fileName.lastIndexOf('.')); + if (extension == null) + return BINARY; + for (int i = 0; i < TYPES.length; i++) { String[] type = TYPES[i]; - if (type[0].equals(extension)) + + if (type[0].equals(extension.toLowerCase())) return type[1]; } - return "application/octet-stream"; + return BINARY; } // getMimeType /** @@ -53,17 +57,7 @@ public class MimeType */ public static MimeType get (String fileName) { - if (fileName == null || fileName.indexOf('.') < 0) - return new MimeType (fileName, BINARY); - // - String extension = fileName.substring(fileName.lastIndexOf('.')); - for (int i = 0; i < TYPES.length; i++) - { - String[] type = TYPES[i]; - if (type[0].equals(extension)) - return new MimeType (fileName, type[1]); - } - return new MimeType (extension, BINARY); + return new MimeType(fileName, getMimeType(fileName)); } // get /** application/octet-stream */