Skip to content

Replace hardcoded Undertow reinit with corresponding build items #1903

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
Apr 8, 2019
Merged

Replace hardcoded Undertow reinit with corresponding build items #1903

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
25 changes: 0 additions & 25 deletions core/deployment/src/main/java/io/quarkus/deployment/steps/SubstrateAutoFeatureStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,31 +95,6 @@ SubstrateOutputBuildItem generateFeature(ClassOutputBuildItem output,
ResultHandle thisClass = overallCatch.loadClass(GRAAL_AUTOFEATURE);
ResultHandle cl = overallCatch.invokeVirtualMethod(ofMethod(Class.class, "getClassLoader", ClassLoader.class),
thisClass);
// FIXME: probably those two hard-coded should be produced by some build step
{
TryBlock tc = overallCatch.tryBlock();
ResultHandle clazz = tc.invokeStaticMethod(
ofMethod(Class.class, "forName", Class.class, String.class, boolean.class, ClassLoader.class),
tc.load("org.wildfly.common.net.HostName"), tc.load(false), cl);
tc.writeArrayValue(array, 0, clazz);
tc.invokeStaticMethod(MethodDescriptor.ofMethod("org.graalvm.nativeimage.RuntimeClassInitialization",
"rerunClassInitialization", void.class, Class[].class), array);

CatchBlockCreator cc = tc.addCatch(Throwable.class);
cc.invokeVirtualMethod(ofMethod(Throwable.class, "printStackTrace", void.class), cc.getCaughtException());
}
{
TryBlock tc = overallCatch.tryBlock();
ResultHandle clazz = tc.invokeStaticMethod(
ofMethod(Class.class, "forName", Class.class, String.class, boolean.class, ClassLoader.class),
tc.load("org.wildfly.common.os.Process"), tc.load(false), cl);
tc.writeArrayValue(array, 0, clazz);
tc.invokeStaticMethod(MethodDescriptor.ofMethod("org.graalvm.nativeimage.RuntimeClassInitialization",
"rerunClassInitialization", void.class, Class[].class), array);

CatchBlockCreator cc = tc.addCatch(Throwable.class);
cc.invokeVirtualMethod(ofMethod(Throwable.class, "printStackTrace", void.class), cc.getCaughtException());
}
for (String i : runtimeReinitializedClassBuildItems.stream().map(RuntimeReinitializedClassBuildItem::getClassName)
.collect(Collectors.toList())) {
TryBlock tc = overallCatch.tryBlock();
Expand Down
7 changes: 7 additions & 0 deletions ...s/undertow/deployment/src/main/java/io/quarkus/undertow/deployment/UndertowBuildStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@
import io.quarkus.deployment.builditem.ServiceStartBuildItem;
import io.quarkus.deployment.builditem.ShutdownContextBuildItem;
import io.quarkus.deployment.builditem.substrate.ReflectiveClassBuildItem;
import io.quarkus.deployment.builditem.substrate.RuntimeReinitializedClassBuildItem;
import io.quarkus.deployment.builditem.substrate.SubstrateConfigBuildItem;
import io.quarkus.deployment.builditem.substrate.SubstrateResourceBuildItem;
import io.quarkus.deployment.recording.RecorderContext;
Expand Down Expand Up @@ -177,6 +178,12 @@ SubstrateConfigBuildItem config() {
.build();
}

@BuildStep
void runtimeReinit(BuildProducer<RuntimeReinitializedClassBuildItem> producer) {
producer.produce(new RuntimeReinitializedClassBuildItem("org.wildfly.common.net.HostName"));
producer.produce(new RuntimeReinitializedClassBuildItem("org.wildfly.common.os.Process"));
}

@BuildStep
HotDeploymentConfigFileBuildItem configFile() {
return new HotDeploymentConfigFileBuildItem(WEB_XML);
Expand Down