joerg 2003/07/03 14:35:43
Modified: src/java/org/apache/cocoon/util MIMEUtils.java
Log:
fixed getMIMEType(File) if the file has no extension
(StringIndexOutOfBoundsException)
Revision Changes Path
1.6 +34 -28 cocoon-2.1/src/java/org/apache/cocoon/util/MIMEUtils.java
Index: MIMEUtils.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/util/MIMEUtils.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MIMEUtils.java 19 Jun 2003 11:17:20 -0000 1.5
+++ MIMEUtils.java 3 Jul 2003 21:35:43 -0000 1.6
@@ -50,22 +50,22 @@
*/
package org.apache.cocoon.util;
+import java.io.BufferedInputStream;
+import java.io.BufferedReader;
import java.io.File;
+import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
-import java.io.BufferedInputStream;
import java.io.InputStream;
-import java.io.FileInputStream;
import java.io.InputStreamReader;
import java.io.Reader;
-import java.io.BufferedReader;
-import java.util.Map;
import java.util.HashMap;
+import java.util.Map;
import java.util.StringTokenizer;
/**
* A collection of <code>File</code>, <code>URL</code> and filename
- * utility methods
+ * utility methods.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Torsten Knodt</a>
@@ -87,7 +87,7 @@
static {
try {
final InputStream is =
MIMEUtils.class.getClassLoader().getResourceAsStream(MIME_MAPPING_FILE);
- if ( null == is ) {
+ if (null == is) {
throw new RuntimeException("Cocoon cannot load MIME type
mappings from " + MIME_MAPPING_FILE);
}
loadMimeTypes(new InputStreamReader(is), extMap, mimeMap);
@@ -100,11 +100,10 @@
* Return the MIME type for a given file.
*
* @param file File.
- *
* @return MIME type.
*/
public static String getMIMEType(final File file)
- throws FileNotFoundException, IOException {
+ throws FileNotFoundException, IOException {
BufferedInputStream in = null;
try {
@@ -112,29 +111,33 @@
byte[] buf = new byte[3];
int count = in.read(buf, 0, 3);
- if (count<3) {
+ if (count < 3) {
return (null);
}
- if ((buf[0])==(byte) 'G' && (buf[1])==(byte) 'I' &&
- (buf[2])==(byte) 'F') {
+ if ((buf[0]) == (byte)'G' && (buf[1]) == (byte)'I' && (buf[2])
== (byte)'F') {
return ("image/gif");
}
- if ((buf[0])==(byte) 0xFF && (buf[1])==(byte) 0xD8) {
+ if ((buf[0]) == (byte)0xFF && (buf[1]) == (byte)0xD8) {
return ("image/jpeg");
}
} finally {
- if (in!=null) {
+ if (in != null) {
try {
in.close();
- } catch (IOException e) {}
+ } catch (IOException e) {
+ }
}
}
final String name = file.getName();
-
- return getMIMEType(name.substring(name.lastIndexOf(".")));
+ int index = name.lastIndexOf(".");
+ String fileExt = ".";
+ if (index != -1) {
+ fileExt = name.substring(index);
+ }
+ return getMIMEType(fileExt);
}
/**
@@ -145,7 +148,7 @@
* @return MIME type.
*/
public static String getMIMEType(final String ext) {
- return (String) mimeMap.get(ext);
+ return (String)mimeMap.get(ext);
}
/**
@@ -156,10 +159,9 @@
* @return Filename extension.
*/
public static String getDefaultExtension(final String type) {
- return (String) extMap.get(type);
+ return (String)extMap.get(type);
}
-
/**
* Parses a <code>mime.types</code> file, and generates mappings between
* MIME types and extensions.
@@ -179,23 +181,27 @@
public static void loadMimeTypes(Reader in, Map extMap, Map mimeMap)
throws IOException {
BufferedReader br = new BufferedReader(in);
String line;
- while ( (line = br.readLine()) != null) {
- if (line.startsWith("#")) continue;
- if (line.trim().equals("")) continue;
+ while ((line = br.readLine()) != null) {
+ if (line.startsWith("#")) {
+ continue;
+ }
+ if (line.trim().equals("")) {
+ continue;
+ }
StringTokenizer tok = new StringTokenizer(line, " \t");
String mimeType = tok.nextToken();
if (tok.hasMoreTokens()) {
String defaultExt = tok.nextToken();
if (!extMap.containsKey(mimeType)) {
- extMap.put(mimeType, "."+defaultExt);
+ extMap.put(mimeType, "." + defaultExt);
}
- if (!mimeMap.containsKey("."+defaultExt)) {
- mimeMap.put("."+defaultExt, mimeType);
+ if (!mimeMap.containsKey("." + defaultExt)) {
+ mimeMap.put("." + defaultExt, mimeType);
}
while (tok.hasMoreTokens()) {
String ext = tok.nextToken();
- if (!mimeMap.containsKey("."+ext)) {
- mimeMap.put("."+ext, mimeType);
+ if (!mimeMap.containsKey("." + ext)) {
+ mimeMap.put("." + ext, mimeType);
}
}
}
