diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/service/ResourceAdapterAdminServiceImpl.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/service/ResourceAdapterAdminServiceImpl.java index 55a47abeb07..6e983874ad0 100755 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/service/ResourceAdapterAdminServiceImpl.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/service/ResourceAdapterAdminServiceImpl.java @@ -78,6 +78,7 @@ public class ResourceAdapterAdminServiceImpl extends ConnectorService { public Thread newThread(Runnable r) { Thread th = new Thread(r); th.setDaemon(true); + th.setName("RA Shutdown"); return th; } }); diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/config/AMXConfigLoader.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/config/AMXConfigLoader.java index fd42cdb1cd5..b343c20ec15 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/config/AMXConfigLoader.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/config/AMXConfigLoader.java @@ -319,6 +319,7 @@ public synchronized ObjectName start() { mLoaderThread = new AMXConfigLoaderThread(mPendingConfigBeans); mLoaderThread.setDaemon(true); + mLoaderThread.setName("AMX Config Loader"); mLoaderThread.start(); mPendingConfigBeans.swapTransactionListener(this); diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/NotificationEmitterSupport.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/NotificationEmitterSupport.java index 0611f471e1e..08d549b2a50 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/NotificationEmitterSupport.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/NotificationEmitterSupport.java @@ -356,6 +356,7 @@ public QueueItem(final Notification notif, final NotificationEmitterSupport send public SenderThread() { setDaemon(true); + setName("JMX Notification Emitter"); mQuit = false; mPendingNotifications = new LinkedBlockingQueue(); } diff --git a/nucleus/common/common-util/src/main/java/com/sun/common/util/logging/LoggingOutputStream.java b/nucleus/common/common-util/src/main/java/com/sun/common/util/logging/LoggingOutputStream.java index bad3fee4e32..ab03ac60475 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/common/util/logging/LoggingOutputStream.java +++ b/nucleus/common/common-util/src/main/java/com/sun/common/util/logging/LoggingOutputStream.java @@ -134,7 +134,7 @@ public void run() { } } }; - pump.setName("logging output pump"); + pump.setName("Logging output pump"); pump.setDaemon(true); pump.start(); } diff --git a/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/osgi/OSGiFrameworkLauncher.java b/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/osgi/OSGiFrameworkLauncher.java index f5a44eb3b3a..e5d0fd70f2e 100644 --- a/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/osgi/OSGiFrameworkLauncher.java +++ b/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/osgi/OSGiFrameworkLauncher.java @@ -97,6 +97,7 @@ public void run() { } }; thread.setDaemon(true); + thread.setName("OSGI Framework Init"); thread.start(); thread.join(); } else { diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobCleanUpService.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobCleanUpService.java index 8dd5a1ea6fe..ac4144225d0 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobCleanUpService.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobCleanUpService.java @@ -80,10 +80,10 @@ public class JobCleanUpService implements PostConstruct,ConfigListener { @Inject Domain domain; - + @Inject private ProcessEnvironment processEnv; - + private ManagedJobConfig managedJobConfig; private final static Logger logger = KernelLoggerInfo.getLogger(); @@ -98,23 +98,22 @@ public class JobCleanUpService implements PostConstruct,ConfigListener { @Override public void postConstruct() { - logger.log(Level.FINE,KernelLoggerInfo.initializingJobCleanup); - + if (Version.getFullVersion().contains("Micro")) { + //if Micro we don't have any jobs to cleanup + return; + } + logger.log(Level.FINE,KernelLoggerInfo.initializingJobCleanup); scheduler = Executors.newScheduledThreadPool(10, new ThreadFactory() { @Override public Thread newThread(Runnable r) { Thread result = new Thread(r); result.setDaemon(true); + result.setName("Job Cleanup Service"); return result; } }); - - if (Version.getFullVersion().contains("Micro")) { - //if Micro we don't have any jobs to cleanup - return; - } managedJobConfig = domain.getExtensionByType(ManagedJobConfig.class); ObservableBean bean = (ObservableBean) ConfigSupport.getImpl(managedJobConfig); diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/GFDomainXml.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/GFDomainXml.java index e0a29cdb0a2..6d8addfd48d 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/GFDomainXml.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/GFDomainXml.java @@ -71,6 +71,7 @@ protected DomDocument getDomDocument() { public Thread newThread(Runnable r) { Thread t = Executors.defaultThreadFactory().newThread(r); t.setDaemon(true); + t.setName("GF Domain XML"); t.setContextClassLoader(habitat.getService(ServerContext.class).getCommonClassLoader()); return t; } diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ScheduledExecutorServiceFactory.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ScheduledExecutorServiceFactory.java index 0f8526b7a33..a9c70b77267 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ScheduledExecutorServiceFactory.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ScheduledExecutorServiceFactory.java @@ -64,6 +64,7 @@ public ScheduledExecutorService provide() { public Thread newThread(Runnable r) { Thread t = Executors.defaultThreadFactory().newThread(r); t.setDaemon(true); + t.setName("Scheduled Executor Service"); return t; } }