svn commit: rev 30986 - avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl
| Newsgroups | gmane.comp.jakarta.avalon.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: niclas
Date: Fri Jul 30 04:04:14 2004
New Revision: 30986
Modified:
avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl/ConfigurationMimeTypes.java
avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl/SystemMimeTypes.java
Log:
Make sure that an empty Strin[] is returned for non-listed mimetypes.
Modified: avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl/ConfigurationMimeTypes.java
==============================================================================
--- avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl/ConfigurationMimeTypes.java (original)
+++ avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl/ConfigurationMimeTypes.java Fri Jul 30 04:04:14 2004
@@ -87,7 +87,10 @@
public String[] getExtensions( String mimetype )
{
- return (String[]) m_MimeTypeToExtMap.get( mimetype );
+ String[] result = (String[]) m_MimeTypeToExtMap.get( mimetype );
+ if( result == null )
+ result = new String[0];
+ return result;
}
}
Modified: avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl/SystemMimeTypes.java
==============================================================================
--- avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl/SystemMimeTypes.java (original)
+++ avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl/SystemMimeTypes.java Fri Jul 30 04:04:14 2004
@@ -99,7 +99,10 @@
public String[] getExtensions( String mimetype )
{
- return (String[]) m_MimeTypeToExtMap.get( mimetype );
+ String[] result = (String[]) m_MimeTypeToExtMap.get( mimetype );
+ if( result == null )
+ result = new String[0];
+ return result;
}
private void processLine( String line )