Merge pull request eclipse-ee4j#23619 from pzygielo/ucam

Remove unused containers
dmatej · Sep 24, 2021 · 440f88c · 440f88c
2 parents 25dff27 + 48c06a6
commit 440f88c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 21 deletions.
diff --git a/...ors/connectors-runtime/src/main/java/com/sun/enterprise/resource/ConnectorXAResource.java b/...ors/connectors-runtime/src/main/java/com/sun/enterprise/resource/ConnectorXAResource.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 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
@@ -57,9 +58,6 @@ public class ConnectorXAResource implements XAResource {
     private ResourceHandle localHandle_;
     private JavaEETransaction associatedTransaction;
 
-    private static Hashtable listenerTable = new Hashtable();
-
-
     // Create logger object per Java SDK 1.4 to log messages
     // introduced Santanu De, Sun Microsystems, March 2002
 
@@ -199,10 +197,6 @@ public boolean setTransactionTimeout(int seconds) throws XAException {
         return false;
     }
 
-    public static void freeListener(ManagedConnection mc) {
-        listenerTable.remove(mc);
-    }
-
     private ResourceHandle getResourceHandle() throws PoolingException {
         try {
             ResourceHandle h = null;

diff --git a/...untime/src/main/java/com/sun/enterprise/resource/allocator/LocalTxConnectorAllocator.java b/...untime/src/main/java/com/sun/enterprise/resource/allocator/LocalTxConnectorAllocator.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 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
@@ -106,7 +107,6 @@ public void destroyResource(ResourceHandle resource)
             throws PoolingException {
         try {
             ManagedConnection mc = (ManagedConnection) resource.getResource();
-            ConnectorXAResource.freeListener(mc);
             XAResource xares = resource.getXAResource();
             forceTransactionCompletion(xares);
             mc.destroy();

diff --git a/appserver/web/gf-weld-connector/src/main/java/org/glassfish/weld/connector/WeldUtils.java b/appserver/web/gf-weld-connector/src/main/java/org/glassfish/weld/connector/WeldUtils.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 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
@@ -123,17 +124,6 @@ public static enum BDAType { WAR, JAR, RAR, UNKNOWN };
         cdiEnablingAnnotations.add(jakarta.ejb.Singleton.class.getName());
     }
 
-    private static final List<String> excludedAnnotationTypes = new ArrayList<String>();
-    static {
-        // These are excluded because they are not scope annotations, and they cause the recursive
-        // analysis of parent annotations to continue infinitely because they reference each other,
-        // and in some cases, they reference themselves.
-        excludedAnnotationTypes.add(Documented.class.getName());
-        excludedAnnotationTypes.add(Retention.class.getName());
-        excludedAnnotationTypes.add(Target.class.getName());
-    }
-
-
     /**
      * Determine whether the specified archive is an implicit bean deployment archive.
      *

diff --git a/...deployment/admin/src/main/java/org/glassfish/deployment/admin/DeploymentCommandUtils.java b/...deployment/admin/src/main/java/org/glassfish/deployment/admin/DeploymentCommandUtils.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 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
@@ -64,8 +65,6 @@ public class DeploymentCommandUtils {
 
     final private static String COPY_IN_PLACE_ARCHIVE_PROP_NAME = "copy.inplace.archive";
 
-    private static final List<String> LIST_CONTAINING_DOMAIN = new ArrayList<String>(Arrays.asList(DeploymentUtils.DOMAIN_TARGET_NAME));
-
     /**
      * Replicates an enable or disable command to all instances in the cluster
      * of which the target is a member.  If the target is not cluster member