|
61 | 61 | import io.quarkus.deployment.configuration.RunTimeConfigurationGenerator; |
62 | 62 | import io.quarkus.deployment.naming.NamingConfig; |
63 | 63 | import io.quarkus.deployment.pkg.PackageConfig; |
64 | | -import io.quarkus.deployment.pkg.builditem.AppCDSControlPointBuildItem; |
65 | | -import io.quarkus.deployment.pkg.builditem.AppCDSRequestedBuildItem; |
66 | 64 | import io.quarkus.deployment.recording.BytecodeRecorderImpl; |
67 | 65 | import io.quarkus.dev.appstate.ApplicationStateNotification; |
68 | 66 | import io.quarkus.dev.console.QuarkusConsole; |
|
77 | 75 | import io.quarkus.gizmo.ResultHandle; |
78 | 76 | import io.quarkus.gizmo.TryBlock; |
79 | 77 | import io.quarkus.runtime.Application; |
80 | | -import io.quarkus.runtime.ApplicationLifecycleManager; |
81 | 78 | import io.quarkus.runtime.ExecutionModeManager; |
82 | 79 | import io.quarkus.runtime.LaunchMode; |
83 | 80 | import io.quarkus.runtime.NativeImageRuntimePropertiesRecorder; |
|
87 | 84 | import io.quarkus.runtime.StartupContext; |
88 | 85 | import io.quarkus.runtime.StartupTask; |
89 | 86 | import io.quarkus.runtime.annotations.QuarkusMain; |
90 | | -import io.quarkus.runtime.appcds.AppCDSUtil; |
91 | 87 | import io.quarkus.runtime.configuration.ConfigUtils; |
92 | 88 | import io.quarkus.runtime.util.StepTiming; |
93 | 89 |
|
@@ -140,8 +136,6 @@ void build(List<StaticBytecodeRecorderBuildItem> staticInitTasks, |
140 | 136 | LiveReloadBuildItem liveReloadBuildItem, |
141 | 137 | ApplicationInfoBuildItem applicationInfo, |
142 | 138 | List<AllowJNDIBuildItem> allowJNDIBuildItems, |
143 | | - Optional<AppCDSRequestedBuildItem> appCDSRequested, |
144 | | - Optional<AppCDSControlPointBuildItem> appCDSControlPoint, |
145 | 139 | NamingConfig namingConfig) { |
146 | 140 |
|
147 | 141 | appClassNameProducer.produce(new ApplicationClassNameBuildItem(Application.APP_CLASS_NAME)); |
@@ -224,22 +218,6 @@ void build(List<StaticBytecodeRecorderBuildItem> staticInitTasks, |
224 | 218 | mv = file.getMethodCreator("doStart", void.class, String[].class); |
225 | 219 | mv.setModifiers(Modifier.PROTECTED | Modifier.FINAL); |
226 | 220 |
|
227 | | - // if AppCDS generation was requested and no other code has requested handling of the process, |
228 | | - // we ensure that the application simply loads some classes from a file and terminates |
229 | | - if (appCDSRequested.isPresent() && appCDSControlPoint.isEmpty()) { |
230 | | - ResultHandle createAppCDsSysProp = mv.invokeStaticMethod( |
231 | | - ofMethod(System.class, "getProperty", String.class, String.class, String.class), |
232 | | - mv.load(GENERATE_APP_CDS_SYSTEM_PROPERTY), mv.load("false")); |
233 | | - ResultHandle createAppCDSBool = mv.invokeStaticMethod( |
234 | | - ofMethod(Boolean.class, "parseBoolean", boolean.class, String.class), createAppCDsSysProp); |
235 | | - BytecodeCreator createAppCDS = mv.ifTrue(createAppCDSBool).trueBranch(); |
236 | | - |
237 | | - createAppCDS.invokeStaticMethod(ofMethod(AppCDSUtil.class, "loadGeneratedClasses", void.class)); |
238 | | - |
239 | | - createAppCDS.invokeStaticMethod(ofMethod(ApplicationLifecycleManager.class, "exit", void.class)); |
240 | | - createAppCDS.returnValue(null); |
241 | | - } |
242 | | - |
243 | 221 | // Make sure we set properties in doStartup as well. This is necessary because setting them in the static-init |
244 | 222 | // sets them at build-time, on the host JVM, while SVM has substitutions for System. get/ setProperty at |
245 | 223 | // run-time which will never see those properties unless we also set them at run-time. |
|
0 commit comments