RequestBuilder.setUrl shouldn't accept an URI without a host, close AsyncHttpClient#571

Author: Stephane Landelle

src/main/java/com/ning/http/client/RequestBuilderBase.java

@@ -379,8 +379,10 @@ public T setUrl(String url) {
     }
 
     public T setURI(URI uri) {
+        if (uri.getHost() == null)
+            throw new NullPointerException("uri.host");
         if (uri.getPath() == null)
-            throw new IllegalArgumentException("Unsupported uri format: " + uri);
+            throw new NullPointerException("uri.path");
         request.originalUri = uri;
         addQueryParameters(request.originalUri);
         request.uri = null;

src/test/java/com/ning/http/client/async/AsyncProvidersBasicTest.java

@@ -393,14 +393,13 @@ public void onThrowable(Throwable t) {
         }
     }
 
-    @Test(groups = { "online", "default_provider", "async" })
+    @Test(groups = { "online", "default_provider", "async" }, expectedExceptions = { NullPointerException.class })
     public void asyncNullSchemeTest() throws Throwable {
         AsyncHttpClient client = getAsyncHttpClient(null);
         try {
             client.prepareGet("www.sun.com").execute();
-            Assert.fail();
-        } catch (IllegalArgumentException ex) {
-            Assert.assertTrue(true);
+        } finally {
+            client.close();;
         }
     }
 
@@ -1654,7 +1653,7 @@ protected String getBrokenTargetUrl() {
         return String.format("http:127.0.0.1:%d/foo/test", port1);
     }
 
-    @Test(groups = { "standalone", "default_provider" }, expectedExceptions = { IllegalArgumentException.class })
+    @Test(groups = { "standalone", "default_provider" }, expectedExceptions = { NullPointerException.class })
     public void invalidUri() throws Exception {
         AsyncHttpClient client = getAsyncHttpClient(null);
         try {