Skip to content
Open
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
import com.sun.enterprise.config.serverbeans.*;
import com.sun.enterprise.deploy.shared.ArchiveFactory;
import com.sun.enterprise.deploy.shared.FileArchive;
import com.sun.enterprise.loader.CachingReflectionUtil;
import com.sun.enterprise.util.LocalStringManagerImpl;
import com.sun.enterprise.util.io.FileUtils;
import fish.payara.enterprise.config.serverbeans.DeploymentGroup;
Expand Down Expand Up @@ -393,10 +394,16 @@ public void actOn(Logger logger) {
return null;
}

span.start(DeploymentTracing.AppStage.PREPARE, "ClassLoaderHierarchy");
ClassLoaderHierarchy clh = habitat.getService(ClassLoaderHierarchy.class);

span.start(DeploymentTracing.AppStage.CLASS_SCANNING);

Types types = null;
if (handler.requiresAnnotationScanning(context.getSource())) {
// web container needs to be loaded before deployable classes can be determined correctly
habitat.getService(CachingReflectionUtil
.getClass("com.sun.enterprise.web.WebContainer", clh.getCommonClassLoader()));
types = getDeployableTypes(context);
}

Expand All @@ -417,10 +424,6 @@ public void actOn(Logger logger) {
final Collection<? extends Sniffer> selectedSniffers = sniffers;
appState.ifPresent(s -> s.setSniffers(selectedSniffers));

span.start(DeploymentTracing.AppStage.PREPARE, "ClassLoaderHierarchy");

ClassLoaderHierarchy clh = habitat.getService(ClassLoaderHierarchy.class);

span.start(DeploymentTracing.AppStage.PREPARE, "ClassLoader");

context.createDeploymentClassLoader(clh, handler);
Expand Down