You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by rb...@apache.org on 2014/05/06 15:27:07 UTC
svn commit: r1592741 - in /shindig/trunk/java/common/src:
main/java/org/apache/shindig/protocol/ContentTypes.java
test/java/org/apache/shindig/protocol/ContentTypesTest.java
Author: rbaxter85
Date: Tue May 6 13:27:07 2014
New Revision: 1592741
URL: http://svn.apache.org/r1592741
Log:
ContentTypes.extractMimePart will blow up if the passed contentType parameter is null
SHINDIG-1975
Committed for Jiaging Guo
Modified:
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/ContentTypes.java
shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/ContentTypesTest.java
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/ContentTypes.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/ContentTypes.java?rev=1592741&r1=1592740&r2=1592741&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/ContentTypes.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/ContentTypes.java Tue May 6 13:27:07 2014
@@ -72,7 +72,11 @@ public final class ContentTypes {
/**
* Extract the mime part from an Http Content-Type header
*/
- public static String extractMimePart(String contentType) {
+ public static String extractMimePart(String contentType) throws InvalidContentTypeException {
+ if (Strings.isNullOrEmpty(contentType)) {
+ throw new InvalidContentTypeException("No Content-Type specified.");
+ }
+
contentType = contentType.trim();
int separator = contentType.indexOf(';');
if (separator != -1) {
Modified: shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/ContentTypesTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/ContentTypesTest.java?rev=1592741&r1=1592740&r2=1592741&view=diff
==============================================================================
--- shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/ContentTypesTest.java (original)
+++ shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/ContentTypesTest.java Tue May 6 13:27:07 2014
@@ -72,4 +72,14 @@ public class ContentTypesTest extends As
public void textExtractMimePart() throws Exception {
assertEquals("text/xml", ContentTypes.extractMimePart("Text/Xml ; charset = ISO-8859-1;x=y"));
}
+
+ @Test(expected=ContentTypes.InvalidContentTypeException.class)
+ public void testExtractMimePartNull() throws Exception {
+ ContentTypes.extractMimePart(null);
+ }
+
+ @Test(expected=ContentTypes.InvalidContentTypeException.class)
+ public void testExtractMimePartEmptyString() throws Exception {
+ ContentTypes.extractMimePart("");
+ }
}