Merge pull request #31 from coldbox-modules/development

release

Author: bdw429s

box.json

@@ -1,7 +1,7 @@
 {
     "name":"JavaLoader",
     "author":"Ortus Solutions.com <info@ortussolutions.com>",
-    "version":"2.5.0",
+    "version":"2.6.0",
     "location":"https://downloads.ortussolutions.com/ortussolutions/coldbox-modules/cbjavaloader/@build.version@/cbjavaloader-@build.version@.zip",
     "slug":"cbjavaloader",
     "type":"modules",

models/javaloader/JavaLoader.cfc

@@ -305,38 +305,54 @@
 		output    ="false"
 	>
 		<cfscript>
-		var iterator                = getClassLoadPaths().iterator();
-		var file                    = 0;
-		var classLoader             = 0;
-		var networkClassLoaderClass = 0;
-		var networkClassLoaderProxy = 0;
-
-		networkClassLoaderClass = getServerURLClassLoader().loadClass(
-			"com.compoundtheory.classloader.NetworkClassLoader"
-		);
-
-		networkClassLoaderProxy = createJavaProxy( networkClassLoaderClass );
-
-		if ( isObject( getParentClassLoader() ) ) {
-			classLoader = networkClassLoaderProxy.init( getParentClassLoader() );
-		} else {
-			classLoader = networkClassLoaderProxy.init();
+		var networkClassLoaderKey = instance.static.uuid & "." & getVersion() & ".networkclassloader";
+
+		// Reuse existing NetworkClassLoader if already cached in server scope
+		if ( structKeyExists( server, networkClassLoaderKey ) ) {
+			setURLClassLoader( server[ networkClassLoaderKey ] );
+			return;
 		}
 
-		while ( iterator.hasNext() ) {
-			file = createObject( "java", "java.io.File" ).init( iterator.next() );
-			if ( NOT file.exists() ) {
-				throwException(
-					"javaloader.PathNotFoundException",
-					"The path you have specified could not be found",
-					file.getAbsolutePath() & " does not exist"
-				);
+		lock name="javaloader.networkclassloader.load" throwontimeout="true" timeout="60" {
+			// Double-check inside lock
+			if ( structKeyExists( server, networkClassLoaderKey ) ) {
+				setURLClassLoader( server[ networkClassLoaderKey ] );
+				return;
 			}
 
-			classLoader.addUrl( file.toURL() );
-		}
+			var iterator                = getClassLoadPaths().iterator();
+			var file                    = 0;
+			var classLoader             = 0;
+			var networkClassLoaderClass = 0;
+			var networkClassLoaderProxy = 0;
+
+			networkClassLoaderClass = getServerURLClassLoader().loadClass(
+				"com.compoundtheory.classloader.NetworkClassLoader"
+			);
+
+			networkClassLoaderProxy = createJavaProxy( networkClassLoaderClass );
+
+			if ( isObject( getParentClassLoader() ) ) {
+				classLoader = networkClassLoaderProxy.init( getParentClassLoader() );
+			} else {
+				classLoader = networkClassLoaderProxy.init();
+			}
 
-		setURLClassLoader( classLoader );
+			while ( iterator.hasNext() ) {
+				file = createObject( "java", "java.io.File" ).init( iterator.next() );
+				if ( NOT file.exists() ) {
+					throwException(
+						"javaloader.PathNotFoundException",
+						"The path you have specified could not be found",
+						file.getAbsolutePath() & " does not exist"
+					);
+				}
+				classLoader.addUrl( file.toURL() );
+			}
+
+			server[ networkClassLoaderKey ] = classLoader;
+			setURLClassLoader( classLoader );
+		}
 		</cfscript>
 	</cffunction>