You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2013/07/19 20:09:24 UTC
svn commit: r1504952 -
/geronimo/specs/trunk/geronimo-activation_1.1_spec/src/main/java/javax/activation/MimetypesFileTypeMap.java
Author: gawor
Date: Fri Jul 19 18:09:24 2013
New Revision: 1504952
URL: http://svn.apache.org/r1504952
Log:
GERONIMO-6484: NPE in MimetypesFileTypeMap
Modified:
geronimo/specs/trunk/geronimo-activation_1.1_spec/src/main/java/javax/activation/MimetypesFileTypeMap.java
Modified: geronimo/specs/trunk/geronimo-activation_1.1_spec/src/main/java/javax/activation/MimetypesFileTypeMap.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-activation_1.1_spec/src/main/java/javax/activation/MimetypesFileTypeMap.java?rev=1504952&r1=1504951&r2=1504952&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-activation_1.1_spec/src/main/java/javax/activation/MimetypesFileTypeMap.java (original)
+++ geronimo/specs/trunk/geronimo-activation_1.1_spec/src/main/java/javax/activation/MimetypesFileTypeMap.java Fri Jul 19 18:09:24 2013
@@ -59,6 +59,9 @@ public class MimetypesFileTypeMap extend
// defaults from resources called /META-INF/mime.types
try {
ClassLoader cl = MimetypesFileTypeMap.class.getClassLoader();
+ if (cl == null) {
+ cl = ClassLoader.getSystemClassLoader();
+ }
Enumeration e = cl.getResources("/META-INF/mime.types");
while (e.hasMoreElements()) {
URL url = (URL) e.nextElement();