Skip to content

Use a single classloader for java 11 #460

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 28, 2021
Merged

Use a single classloader for java 11 #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions ...dtests/Azure.Functions.Java.Tests.E2E/Azure.Functions.Java.Tests.E2E/HttpEndToEndTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,14 @@ public async Task HttpTriggerJavaClassLoader()
Assert.True(await Utilities.InvokeHttpTrigger("HttpTriggerJavaClassLoader", "?&name=Test", HttpStatusCode.OK, "Test"));

}

[Fact]
public async void HttpTriggerJavaStatic()
{
await HttpTriggerTests("HttpTriggerJavaStatic1", "", HttpStatusCode.OK, "1");
await HttpTriggerTests("HttpTriggerJavaStatic2", "", HttpStatusCode.OK, "2");
await HttpTriggerTests("HttpTriggerJavaStatic1", "", HttpStatusCode.OK, "3");
await HttpTriggerTests("HttpTriggerJavaStatic2", "", HttpStatusCode.OK, "4");
}
}
}
28 changes: 28 additions & 0 deletions endtoendtests/src/main/java/com/microsoft/azure/functions/endtoend/HttpTriggerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,4 +237,32 @@ public HttpResponseMessage runRetryExponentialBackoffRetryFail(
return request.createResponseBuilder(HttpStatus.OK).body("Hello, " + name).build();
}
}

private static int flag = 0;

@FunctionName("HttpTriggerJavaStatic1")
public HttpResponseMessage HttpTriggerJavaStatic1(
@HttpTrigger(
name = "req",
methods = {HttpMethod.GET, HttpMethod.POST},
authLevel = AuthorizationLevel.ANONYMOUS)
HttpRequestMessage<Optional<String>> request,
final ExecutionContext context) {
context.getLogger().info("Java HTTP trigger - static processed a request.");
flag++;
return request.createResponseBuilder(HttpStatus.OK).body(String.valueOf(flag)).build();
}

@FunctionName("HttpTriggerJavaStatic2")
public HttpResponseMessage HttpTriggerJavaStatic2(
@HttpTrigger(
name = "req",
methods = {HttpMethod.GET, HttpMethod.POST},
authLevel = AuthorizationLevel.ANONYMOUS)
HttpRequestMessage<Optional<String>> request,
final ExecutionContext context) {
context.getLogger().info("Java HTTP trigger - static processed a request.");
flag++;
return request.createResponseBuilder(HttpStatus.OK).body(String.valueOf(flag)).build();
}
}
20 changes: 14 additions & 6 deletions src/main/java/com/microsoft/azure/functions/worker/reflect/EnhancedClassLoaderProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,18 @@ public EnhancedClassLoaderProvider() {
*/
@Override
public ClassLoader createClassLoader() {
URL[] urlsForClassLoader = new URL[urls.size()];
urls.toArray(urlsForClassLoader);

URLClassLoader classLoader = new URLClassLoader(urlsForClassLoader);
loadDrivers(classLoader);
return classLoader;
if (classLoaderInstance == null) {
synchronized (lock) {
if (classLoaderInstance == null) {
URL[] urlsForClassLoader = new URL[urls.size()];
urls.toArray(urlsForClassLoader);
URLClassLoader loader = new URLClassLoader(urlsForClassLoader);
loadDrivers(loader);
classLoaderInstance = loader;
}
}
}
return classLoaderInstance;
}

private void loadDrivers(URLClassLoader classLoader) {
Expand Down Expand Up @@ -73,4 +79,6 @@ public void addUrl(URL url) throws IOException {
urls.add(url);
}
private final Set<URL> urls;
Copy link
Member

@trask trask Sep 24, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
private final Set<URL> urls;
private final Set<URL> urls;
private final Object lock = new Object();

private final Object lock = new Object();
private static volatile URLClassLoader classLoaderInstance;
}