From ab9037d5328c88bb91ad7e3136a34b7ee175a22e Mon Sep 17 00:00:00 2001
From: Attila Szegedi <szegedia@gmail.com>
Date: Wed, 6 Jul 2011 21:17:22 -0700
Subject: [PATCH] Guard against null base URL (i.e. when passed from
 ModuleSourceProvider.loadSource())

---
 .../commonjs/module/provider/UrlModuleSourceProvider.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/mozilla/javascript/commonjs/module/provider/UrlModuleSourceProvider.java b/src/org/mozilla/javascript/commonjs/module/provider/UrlModuleSourceProvider.java
index b1b6ff2f17..fba9bc3b9b 100644
--- a/src/org/mozilla/javascript/commonjs/module/provider/UrlModuleSourceProvider.java
+++ b/src/org/mozilla/javascript/commonjs/module/provider/UrlModuleSourceProvider.java
@@ -130,7 +130,7 @@ protected ModuleSource loadFromUri(URI uri, URI base, Object validator)
     protected ModuleSource loadFromActualUri(URI uri, URI base, Object validator)
     throws IOException
     {
-        final URL url = new URL(base.toURL(), uri.toString());
+        final URL url = new URL(base == null ? null : base.toURL(), uri.toString());
         final long request_time = System.currentTimeMillis();
         final URLConnection urlConnection = openUrlConnection(url);
         final URLValidator applicableValidator;