Merge pull request #31 from kamilszymanski/timeouts

fix handling of timed out HttpURLClient requests with contentType.ANY

Author: jgritman

.gitignore

@@ -1 +1,3 @@
 target/
+*.iml
+.idea/

src/main/java/groovyx/net/http/ParserRegistry.java

@@ -361,9 +361,11 @@ public void setDefaultParser( Closure defaultParser ) {
      * @param contentType
      * @return parser that can interpret the given response content type,
      *   or the default parser if no parser is registered for the given
-     *   content-type.  It should NOT return a null value.
+     *   content-type.
      */
     public Closure getAt( Object contentType ) {
+        if ( contentType == null ) return defaultParser;
+
         String ct = contentType.toString();
         int idx = ct.indexOf( ';' );
         if ( idx > 0 ) ct = ct.substring( 0, idx );

src/test/groovy/groovyx/net/http/HttpURLClientTest.groovy

@@ -2,17 +2,10 @@ package groovyx.net.http
 
 import org.junit.Ignore
 import org.junit.Test
-import java.lang.AssertionError
-import java.io.Reader
-import java.io.StringReader;
 
-import groovy.util.XmlSlurper
-import groovy.util.slurpersupport.GPathResult
 import org.apache.http.client.HttpResponseException
-import java.io.ByteArrayOutputStream
 import static groovyx.net.http.ContentType.*
 import static groovyx.net.http.Method.*
-import org.apache.xml.resolver.tools.CatalogResolver
 
 class HttpURLClientTest {
 
@@ -237,4 +230,9 @@ class HttpURLClientTest {
         }
         catch ( IllegalArgumentException ex ) { /* Expected exception */ }
     }
+
+    @Test(expected = SocketTimeoutException)
+    void testTimeout() {
+        new HttpURLClient(url: 'https://www.google.com/').request(timeout: 1)
+    }
 }