twitter
diff --git a/‎CHANGES‎
Lines changed: 9 additions & 1 deletion b/‎CHANGES‎
Lines changed: 9 additions & 1 deletion
diff --git a/‎util-app/src/main/scala/com/twitter/app/ClassPath.scala‎
Lines changed: 9 additions & 3 deletions b/‎util-app/src/main/scala/com/twitter/app/ClassPath.scala‎
Lines changed: 9 additions & 3 deletions
diff --git a/‎util-app/src/test/scala/com/twitter/app/ClassPathTest.scala‎
Lines changed: 29 additions & 0 deletions b/‎util-app/src/test/scala/com/twitter/app/ClassPathTest.scala‎
Lines changed: 29 additions & 0 deletions
@@ -9,8 +9,16 @@ Unreleased
 API Changes:
 
   * util-class-preloader: This library has been removed since it deprecated. We
-  no longer recommend that people do this. ``PHAB_ID=D174250``
+    no longer recommend that people do this. ``PHAB_ID=D174250``
 
+Bug Fixes:
+
+  * util-app: Fix issue where in some environments, `URLClassLoader#getURLs` can
+    return null, failing LoadService from initializing properly
+    (see: https://github.com/google/guava/issues/2239). The `URLClassLoader` javadoc
+    is not clear if a null can be returned when calling `URLClassLoader#getURLs` and for
+    at least one application server, the default returned is null, thus we should be more
+    resilient against this possibility. Fixes Finagle #695. ``PHAB_ID=D181152``
 
 Deprecations:
 
 
@@ -61,16 +61,22 @@ private[app] sealed abstract class ClassPath[CpInfo <: ClassPath.Info] {
     buf
   }
 
-  private[this] def getEntries(loader: ClassLoader): Seq[(URI, ClassLoader)] = {
+  // package protected for testing
+  private[app] def getEntries(loader: ClassLoader): Seq[(URI, ClassLoader)] = {
     val ents = mutable.Buffer[(URI, ClassLoader)]()
     val parent = loader.getParent
     if (parent != null)
       ents ++= getEntries(parent)
 
     loader match {
       case urlLoader: URLClassLoader =>
-        for (url <- urlLoader.getURLs) {
-          ents += (url.toURI -> loader)
+        Option(urlLoader.getURLs) match {
+          case Some(urls) =>
+            urls.foreach { url =>
+              if (url != null)
+                ents += (url.toURI -> loader)
+            }
+          case _ =>
         }
       case _ =>
     }
 
@@ -0,0 +1,29 @@
+package com.twitter.app
+
+import java.net.URLClassLoader
+import org.mockito.Mockito._
+import org.scalatest.FunSuite
+import org.scalatest.mockito.MockitoSugar
+
+class ClassPathTest extends FunSuite with MockitoSugar {
+
+  test("Null URL[] URLClassloader") {
+    val classLoader = mock[URLClassLoader]
+    when(classLoader.getURLs).thenReturn(null)
+
+    val classPath = new LoadServiceClassPath()
+    val entries = classPath.getEntries(classLoader)
+    assert(entries.isEmpty)
+  }
+
+  test("Null entry in URL[] from URLClassloader") {
+    val urls = Array[java.net.URL](null)
+
+    val classLoader = mock[URLClassLoader]
+    when(classLoader.getURLs).thenReturn(urls)
+
+    val classPath = new LoadServiceClassPath()
+    val entries = classPath.getEntries(classLoader)
+    assert(entries.isEmpty)
+  }
+}