fekepp
diff --git a/‎core/src/main/java/com/github/jsonldjava/core/DocumentLoader.java‎
Lines changed: 7 additions & 5 deletions b/‎core/src/main/java/com/github/jsonldjava/core/DocumentLoader.java‎
Lines changed: 7 additions & 5 deletions
@@ -111,13 +111,14 @@ public static InputStream openStreamFromURL(java.net.URL url) throws IOException
     }
 
     public static HttpClient getHttpClient() {
-        if (httpClient == null) {
+        HttpClient result = httpClient;
+        if (result == null) {
             synchronized (JSONUtils.class) {
-                if (httpClient == null) {
+                result = httpClient;
+                if (result == null) {
                     // Uses Apache SystemDefaultHttpClient rather than
                     // DefaultHttpClient, thus the normal proxy settings for the
-                    // JVM
-                    // will be used
+                    // JVM will be used
 
                     final DefaultHttpClient client = new SystemDefaultHttpClient();
                     // Support compressed data
@@ -129,10 +130,11 @@ public static HttpClient getHttpClient() {
                     cacheConfig.setMaxCacheEntries(1000);
                     // and allow caching
                     httpClient = new CachingHttpClient(client, cacheConfig);
+                    result = httpClient;
                 }
             }
         }
-        return httpClient;
+        return result;
     }
 
     public static void setHttpClient(HttpClient nextHttpClient) {
Original file line number	Diff line number	Diff line change
`@@ -111,13 +111,14 @@ public static InputStream openStreamFromURL(java.net.URL url) throws IOException`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`public static HttpClient getHttpClient() {`
`114`		`- if (httpClient == null) {`
	`114`	`+ HttpClient result = httpClient;`
	`115`	`+ if (result == null) {`
`115`	`116`	`synchronized (JSONUtils.class) {`
`116`		`- if (httpClient == null) {`
	`117`	`+ result = httpClient;`
	`118`	`+ if (result == null) {`
`117`	`119`	`// Uses Apache SystemDefaultHttpClient rather than`
`118`	`120`	`// DefaultHttpClient, thus the normal proxy settings for the`
`119`		`- // JVM`
`120`		`- // will be used`
	`121`	`+ // JVM will be used`
`121`	`122`
`122`	`123`	`final DefaultHttpClient client = new SystemDefaultHttpClient();`
`123`	`124`	`// Support compressed data`
`@@ -129,10 +130,11 @@ public static HttpClient getHttpClient() {`
`129`	`130`	`cacheConfig.setMaxCacheEntries(1000);`
`130`	`131`	`// and allow caching`
`131`	`132`	`httpClient = new CachingHttpClient(client, cacheConfig);`
	`133`	`+ result = httpClient;`
`132`	`134`	`}`
`133`	`135`	`}`
`134`	`136`	`}`
`135`		`- return httpClient;`
	`137`	`+ return result;`
`136`	`138`	`}`
`137`	`139`
`138`	`140`	`public static void setHttpClient(HttpClient nextHttpClient) {`