Code refactor based on review comments

shreyas-gopalakrishna · shreyas-gopalakrishna · commit dbf959e29a84 · 2021-09-27T17:09:17.000-05:00
diff --git a/src/main/java/com/microsoft/azure/functions/worker/reflect/EnhancedClassLoaderProvider.java b/src/main/java/com/microsoft/azure/functions/worker/reflect/EnhancedClassLoaderProvider.java
@@ -23,7 +23,6 @@ public ClassLoader createClassLoader() {
             return getURLClassLoaderInstance();
         }else{
             URLClassLoader classLoader = createURLClassLoaderInstance();
-            loadDrivers(classLoader);
             return classLoader;
         }
     }
@@ -37,7 +36,6 @@ private URLClassLoader getURLClassLoaderInstance() {
             synchronized (lock) {
                 if (classLoaderInstance == null) {
                     URLClassLoader loader = createURLClassLoaderInstance();
-                    loadDrivers(loader);
                     classLoaderInstance = loader;
                 }
             }
@@ -48,7 +46,9 @@ private URLClassLoader getURLClassLoaderInstance() {
     private URLClassLoader createURLClassLoaderInstance(){
         URL[] urlsForClassLoader = new URL[urls.size()];
         urls.toArray(urlsForClassLoader);
-        return new URLClassLoader(urlsForClassLoader);
+        URLClassLoader classLoader = new URLClassLoader(urlsForClassLoader);
+        loadDrivers(classLoader);
+        return classLoader;
     }
 
     private void loadDrivers(URLClassLoader classLoader) {

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,6 @@ public ClassLoader createClassLoader() {`
`23`	`23`	`return getURLClassLoaderInstance();`
`24`	`24`	`}else{`
`25`	`25`	`URLClassLoader classLoader = createURLClassLoaderInstance();`
`26`		`- loadDrivers(classLoader);`
`27`	`26`	`return classLoader;`
`28`	`27`	`}`
`29`	`28`	`}`
`@@ -37,7 +36,6 @@ private URLClassLoader getURLClassLoaderInstance() {`
`37`	`36`	`synchronized (lock) {`
`38`	`37`	`if (classLoaderInstance == null) {`
`39`	`38`	`URLClassLoader loader = createURLClassLoaderInstance();`
`40`		`- loadDrivers(loader);`
`41`	`39`	`classLoaderInstance = loader;`
`42`	`40`	`}`
`43`	`41`	`}`
`@@ -48,7 +46,9 @@ private URLClassLoader getURLClassLoaderInstance() {`
`48`	`46`	`private URLClassLoader createURLClassLoaderInstance(){`
`49`	`47`	`URL[] urlsForClassLoader = new URL[urls.size()];`
`50`	`48`	`urls.toArray(urlsForClassLoader);`
`51`		`- return new URLClassLoader(urlsForClassLoader);`
	`49`	`+ URLClassLoader classLoader = new URLClassLoader(urlsForClassLoader);`
	`50`	`+ loadDrivers(classLoader);`
	`51`	`+ return classLoader;`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`private void loadDrivers(URLClassLoader classLoader) {`