Guard against NullPointerException currently

occurring in Volley when a Request is given a url whose host is null.

Change-Id: Idab1dadaa43bb9176356028221cbdc0f8dd52cdc

1 files changed, 17 insertions, 1 deletions

diff --git a/src/com/android/volley/Request.java b/src/com/android/volley/Request.java
index 0e5912f..53093e6 100644
--- a/src/com/android/volley/Request.java
+++ b/src/com/android/volley/Request.java
@@ -134,7 +134,7 @@ public abstract class Request<T> implements Comparable<Request<T>> {
         mErrorListener = listener;
         setRetryPolicy(new DefaultRetryPolicy());
 
-        mDefaultTrafficStatsTag = TextUtils.isEmpty(url) ? 0: Uri.parse(url).getHost().hashCode();
+        mDefaultTrafficStatsTag = findDefaultTrafficStatsTag(url);
     }
 
     /**
@@ -171,6 +171,22 @@ public abstract class Request<T> implements Comparable<Request<T>> {
     }
 
     /**
+     * @return The hashcode of the URL's host component, or 0 if there is none.
+     */
+    private static int findDefaultTrafficStatsTag(String url) {
+        if (!TextUtils.isEmpty(url)) {
+            Uri uri = Uri.parse(url);
+            if (uri != null) {
+                String host = uri.getHost();
+                if (host != null) {
+                    return host.hashCode();
+                }
+            }
+        }
+        return 0;
+    }
+
+    /**
      * Sets the retry policy for this request.
      *
      * @return This Request object to allow for chaining.