Author: bdelacretaz
Date: Fri Jun 26 10:28:44 2015
New Revision: 1687739
URL: http://svn.apache.org/r1687739
Log:
cannot be null here, remove dead code
Modified:
sling/trunk/bundles/commons/contentdetection/src/main/java/org/apache/sling/commons/contentdetection/internal/ContentAwareMimeTypeServiceImpl.java
Modified:
sling/trunk/bundles/commons/contentdetection/src/main/java/org/apache/sling/commons/contentdetection/internal/ContentAwareMimeTypeServiceImpl.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/contentdetection/src/main/java/org/apache/sling/commons/contentdetection/internal/ContentAwareMimeTypeServiceImpl.java?rev=1687739&r1=1687738&r2=1687739&view=diff
==============================================================================
---
sling/trunk/bundles/commons/contentdetection/src/main/java/org/apache/sling/commons/contentdetection/internal/ContentAwareMimeTypeServiceImpl.java
(original)
+++
sling/trunk/bundles/commons/contentdetection/src/main/java/org/apache/sling/commons/contentdetection/internal/ContentAwareMimeTypeServiceImpl.java
Fri Jun 26 10:28:44 2015
@@ -50,7 +50,7 @@ public class ContentAwareMimeTypeService
if(content == null) {
return mimeTypeService.getMimeType(filename);
}
- if(content != null && !content.markSupported()) {
+ if(!content.markSupported()) {
throw new IllegalArgumentException("Supplied InputStream does not
support mark/reset");
}
TikaInputStream stream = TikaInputStream.get(content);