commit 3cb1ef7f6b87e2d708aa961aa0d6d963b3628cb9
author endtak <endo.takafumi@jp.fujitsu.com> Thu Sep 26 19:20:27 2019 +0900
committer endtak <endo.takafumi@jp.fujitsu.com> Thu Sep 26 19:25:46 2019 +0900
tree 768e7ca981a4bb1e2ce45e102814fc23c1aa3272
parent 15e2fbb25e68882b1d65191185c54362831b1408

Fix for ear redeploy fails(eclipse-ee4j#22383)

Signed-off-by: endtak <endo.takafumi@jp.fujitsu.com>

nucleus/common/internal-api/src/main/java/org/glassfish/internal/data/ApplicationInfo.java

diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/data/ApplicationInfo.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/data/ApplicationInfo.java
index 829a810..9e2345c 100644
--- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/data/ApplicationInfo.java
+++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/data/ApplicationInfo.java
@@ -424,7 +424,11 @@
         // clean up the app level classloader
         if (appClassLoader != null) {
             try {
-                appServiceLocator.preDestroy(appClassLoader);
+                if (appServiceLocator != null) {
+                    appServiceLocator.preDestroy(appClassLoader);
+                } else {
+                    PreDestroy.class.cast(appClassLoader).preDestroy();
+                }
             }
             catch (Exception e) {
                 // Ignore, some failure in preDestroy