Skip to content

Commit dffe709

Browse files
committed
move initialization logic back to where it used to be
1 parent 925e58c commit dffe709

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<azure.functions.java.library.version>2.2.0</azure.functions.java.library.version>
2222
<jupiter.version>5.9.1</jupiter.version>
2323
<mockito-core.version>4.11.0</mockito-core.version>
24-
<appinsights.agents.version>3.7.1</appinsights.agents.version>
24+
<appinsights.agents.version>3.6.2</appinsights.agents.version>
2525
</properties>
2626
<licenses>
2727
<license>

src/main/java/com/microsoft/azure/functions/worker/broker/JavaFunctionBroker.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,13 @@ public JavaFunctionBroker(ClassLoaderProvider classLoaderProvider) {
6868
this.workerObjectCache = null;
6969
}
7070

71-
initializeOneTimeLogics();
7271
}
7372

7473
public void loadMethod(FunctionMethodDescriptor descriptor, Map<String, BindingInfo> bindings)
7574
throws ClassNotFoundException, NoSuchMethodException, IOException {
7675
descriptor.validate();
7776
addSearchPathsToClassLoader(descriptor);
77+
initializeOneTimeLogics();
7878
FunctionDefinition functionDefinition = new FunctionDefinition(descriptor, bindings, classLoaderProvider);
7979

8080
if (JAVA_ENABLE_SDK_TYPES_FLAG) {
@@ -112,14 +112,14 @@ private void initializeOneTimeLogics() {
112112
synchronized (oneTimeLogicInitializationLock) {
113113
if (!oneTimeLogicInitialized) {
114114
userContextClassLoader = classLoaderProvider.createClassLoader();
115+
oneTimeLogicInitialized = true;
116+
initializeFunctionInstanceInjector();
117+
115118
if (JAVA_ENABLE_SDK_TYPES_FLAG) {
116119
loadGlobalMiddlewares();
117120
} else {
118121
initializeInvocationChainFactory();
119122
}
120-
121-
initializeFunctionInstanceInjector();
122-
oneTimeLogicInitialized = true;
123123
}
124124
}
125125
}
@@ -146,15 +146,14 @@ private void initializeInvocationChainFactory() {
146146
Thread.currentThread().setContextClassLoader(userContextClassLoader);
147147
for (Middleware middleware : ServiceLoader.load(Middleware.class)) {
148148
this.serviceLoadedMiddlewares.add(middleware);
149-
WorkerLogManager.getSystemLogger().info("Load middleware " + middleware.getClass().getSimpleName());
149+
WorkerLogManager.getSystemLogger().info("Load middleware test!!" + middleware.getClass().getSimpleName());
150150
}
151151
} finally {
152152
Thread.currentThread().setContextClassLoader(prevContextClassLoader);
153+
ArrayList<Middleware> middlewares = new ArrayList<>(this.serviceLoadedMiddlewares);
154+
middlewares.add(getFunctionExecutionMiddleWare(userContextClassLoader));
155+
this.invocationChainFactory = new InvocationChainFactory(middlewares);
153156
}
154-
155-
ArrayList<Middleware> middlewares = new ArrayList<>(this.serviceLoadedMiddlewares);
156-
middlewares.add(getFunctionExecutionMiddleWare(userContextClassLoader));
157-
this.invocationChainFactory = new InvocationChainFactory(middlewares);
158157
}
159158

160159
private void initializeFunctionInstanceInjector() {

0 commit comments

Comments
 (0)