svn commit: r924272 - /incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/DiscobitsTypeHandler.java

[reto]

Author: reto
Date: Wed Mar 17 13:15:45 2010
New Revision: 924272

URL: http://svn.apache.org/viewvc?rev=924272&view=rev
Log:
preventing nullpointer on unguessable media type

Modified:
    
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/DiscobitsTypeHandler.java

Modified: 
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/DiscobitsTypeHandler.java
URL: 
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/DiscobitsTypeHandler.java?rev=924272&r1=924271&r2=924272&view=diff
==============================================================================
--- 
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/DiscobitsTypeHandler.java
 (original)
+++ 
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/DiscobitsTypeHandler.java
 Wed Mar 17 13:15:45 2010
@@ -166,10 +166,10 @@ public class DiscobitsTypeHandler extend
                        final List<String> contentTypeHeaders = 
headers.getRequestHeader(HttpHeaders.CONTENT_TYPE);
                        if (contentTypeHeaders == null) {
                                logger.warn("Content-Type not specified");
-                               String guessedContentType = 
MediaTypeGuesser.getInstance().guessTypeForName(
-                                               
uriInfo.getAbsolutePath().toString()).toString();
-                               contentType = guessedContentType == null ?
-                                       MediaType.APPLICATION_OCTET_STREAM : 
guessedContentType;
+                               final MediaType guessTypeForName = 
MediaTypeGuesser.getInstance().
+                                               
guessTypeForName(uriInfo.getAbsolutePath().toString());
+                               contentType = guessTypeForName == null ?
+                                       MediaType.APPLICATION_OCTET_STREAM : 
guessTypeForName.toString();
                        } else {
                                contentType = contentTypeHeaders.get(0);
                        }