Merge pull request #23575 from pzygielo/containers
Remove unused fields and dead code
diff --git a/appserver/admingui/plugin-service/src/main/java/org/glassfish/admingui/plugin/ConsolePluginService.java b/appserver/admingui/plugin-service/src/main/java/org/glassfish/admingui/plugin/ConsolePluginService.java
index d80ecb4..25bc0f2 100644
--- a/appserver/admingui/plugin-service/src/main/java/org/glassfish/admingui/plugin/ConsolePluginService.java
+++ b/appserver/admingui/plugin-service/src/main/java/org/glassfish/admingui/plugin/ConsolePluginService.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -143,11 +144,6 @@
if (locale == null) {
locale = "en"; // Use this as the default...
}
- TOC mergedTOC = helpSetMap.get(locale);
- if (mergedTOC != null) {
- // Already calculated...
- return mergedTOC;
- }
// TOC
Map<String, List<URL>> mapUrls = getResources(locale + "/help/toc.xml");
@@ -156,7 +152,7 @@
ConfigParser parser = new ConfigParser(habitat);
// Setup a new "merged" TOC...
- mergedTOC = new TOC();
+ var mergedTOC = new TOC();
mergedTOC.setTOCItems(new ArrayList<TOCItem>());
mergedTOC.setVersion("2.0");
@@ -211,11 +207,6 @@
if (locale == null) {
locale = "en"; // Use this as the default...
}
- Index mergedIndex = helpSetIndexMap.get(locale);
- if (mergedIndex != null) {
- // Already calculated...
- return mergedIndex;
- }
// TOC
Map<String, List<URL>> mapUrls = getResources(locale + "/help/index.xml");
@@ -224,7 +215,7 @@
ConfigParser parser = new ConfigParser(habitat);
// Setup a new "merged" TOC...
- mergedIndex = new Index();
+ var mergedIndex = new Index();
mergedIndex.setIndexItems(new ArrayList<IndexItem>());
mergedIndex.setVersion("2.0");
@@ -457,12 +448,4 @@
*/
private Map<ClassLoader, String> classLoaderModuleMap =
new HashMap<ClassLoader, String>();
-
- /**
- *
- */
- private Map<String, TOC> helpSetMap = new HashMap<String, TOC>();
-
- private Map<String, Index> helpSetIndexMap = new HashMap<String, Index>();
-
}
diff --git a/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/GMSAdapterImpl.java b/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/GMSAdapterImpl.java
index db9f1d6..fce1a31 100644
--- a/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/GMSAdapterImpl.java
+++ b/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/GMSAdapterImpl.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -124,8 +125,6 @@
new ConcurrentHashMap<CallBack, FailureNotificationActionFactory>();
private ConcurrentHashMap<CallBack, FailureSuspectedActionFactory> callbackFailureSuspectedActionFactoryMapping =
new ConcurrentHashMap<CallBack, FailureSuspectedActionFactory>();
- private ConcurrentHashMap<CallBack, GroupLeadershipNotificationActionFactory> callbackGroupLeadershipActionFactoryMapping =
- new ConcurrentHashMap<CallBack, GroupLeadershipNotificationActionFactory>();
private ConcurrentHashMap<CallBack, PlannedShutdownActionFactory> callbackPlannedShutdownActionFactoryMapping =
new ConcurrentHashMap<CallBack, PlannedShutdownActionFactory>();
private EventListener glassfishEventListener = null;
@@ -1187,12 +1186,6 @@
@Override
public void removeGroupLeadershipLNotificationistener(CallBack callback){
- if (gms != null) {
- GroupLeadershipNotificationActionFactory glnf = callbackGroupLeadershipActionFactoryMapping.get(callback);
- if (glnf != null) {
- gms.removeActionFactory(glnf);
- }
- }
}
@Override
