[java-metadata-aggregator] branch main updated: MDA-268 - Remove field nulling at end of bean lifetimes
Ian Young
ian at iay.org.uk
Thu Mar 3 18:09:37 UTC 2022
This is an automated email from the git hooks/post-receive script.
iay pushed a commit to branch main
in repository java-metadata-aggregator.
View the commit online:
http://git.shibboleth.net/view/?p=java-metadata-aggregator.git;a=commit;h=77062bb029f5ff6eda1bd9aa0cbe14852a81e742
The following commit(s) were added to refs/heads/main by this push:
new 77062bb MDA-268 - Remove field nulling at end of bean lifetimes
77062bb is described below
commit 77062bb029f5ff6eda1bd9aa0cbe14852a81e742
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Thu Mar 3 18:09:32 2022 +0000
MDA-268 - Remove field nulling at end of bean lifetimes
https://shibboleth.atlassian.net/browse/MDA-268
---
.../shibboleth/metadata/dom/AbstractDOMValidationStage.java | 4 ++--
.../metadata/dom/AbstractElementValidationStage.java | 7 -------
.../metadata/dom/AbstractElementVisitingStage.java | 6 ------
.../shibboleth/metadata/dom/AbstractXSLProcessingStage.java | 12 ------------
.../shibboleth/metadata/dom/DOMFilesystemSourceStage.java | 9 ---------
.../net/shibboleth/metadata/dom/DOMResourceSourceStage.java | 8 --------
.../net/shibboleth/metadata/dom/ElementStrippingStage.java | 8 --------
.../net/shibboleth/metadata/dom/ElementsStrippingStage.java | 8 --------
.../metadata/dom/EmptyContainerStrippingStage.java | 8 --------
.../shibboleth/metadata/dom/NamespaceStrippingStage.java | 7 -------
.../shibboleth/metadata/dom/NamespacesStrippingStage.java | 7 -------
.../shibboleth/metadata/dom/XMLSchemaValidationStage.java | 8 --------
.../shibboleth/metadata/dom/XMLSignatureSigningStage.java | 13 -------------
.../metadata/dom/XMLSignatureValidationStage.java | 10 ----------
.../net/shibboleth/metadata/dom/XPathFilteringStage.java | 8 --------
.../net/shibboleth/metadata/dom/ds/X509ValidationStage.java | 6 ------
.../metadata/dom/saml/ContactPersonFilterStage.java | 5 -----
.../metadata/dom/saml/EntitiesDescriptorAssemblerStage.java | 8 --------
.../net/shibboleth/metadata/dom/saml/EntityFilterStage.java | 7 -------
.../shibboleth/metadata/dom/saml/EntityRoleFilterStage.java | 7 -------
.../dom/saml/mdattr/EntityAttributeFilteringStage.java | 7 -------
.../saml/mdrpi/EntityRegistrationAuthorityFilterStage.java | 7 -------
.../pipeline/AbstractItemMetadataSelectionStage.java | 8 --------
.../net/shibboleth/metadata/pipeline/CompositeStage.java | 6 ------
.../pipeline/FilesInDirectoryMultiOutputStrategy.java | 10 ----------
.../net/shibboleth/metadata/pipeline/ItemOrderingStage.java | 7 -------
.../metadata/pipeline/MultiOutputSerializationStage.java | 8 --------
.../metadata/pipeline/PipelineDemultiplexerStage.java | 9 ---------
.../shibboleth/metadata/pipeline/PipelineMergeStage.java | 10 ----------
.../shibboleth/metadata/pipeline/SerializationStage.java | 8 --------
.../net/shibboleth/metadata/pipeline/SimplePipeline.java | 7 -------
.../net/shibboleth/metadata/pipeline/SplitMergeStage.java | 12 ------------
.../shibboleth/metadata/pipeline/StaticItemSourceStage.java | 6 ------
.../net/shibboleth/metadata/validate/ValidatorSequence.java | 6 ------
.../validate/x509/X509RSAOpenSSLBlacklistValidator.java | 2 +-
35 files changed, 3 insertions(+), 266 deletions(-)
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractDOMValidationStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractDOMValidationStage.java
index 8fafed1..0ceda53 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractDOMValidationStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractDOMValidationStage.java
@@ -87,8 +87,8 @@ public abstract class AbstractDOMValidationStage<V, C extends DOMTraversalContex
@Override
protected void doDestroy() {
/*
- * We can not discard the reference to the validators object,
- * but we can destroy it.
+ * We created and initialized the validators object,
+ * so we should destroy it.
*/
validators.destroy();
super.doDestroy();
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractElementValidationStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractElementValidationStage.java
index 1e93b56..c8478cd 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractElementValidationStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractElementValidationStage.java
@@ -114,11 +114,4 @@ public abstract class AbstractElementValidationStage<T> extends AbstractDOMValid
}
}
- @Override
- protected void doDestroy() {
- elementNames = null;
-
- super.doDestroy();
- }
-
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractElementVisitingStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractElementVisitingStage.java
index 9d2c83c..3e8967d 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractElementVisitingStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractElementVisitingStage.java
@@ -90,10 +90,4 @@ public abstract class AbstractElementVisitingStage extends AbstractDOMTraversalS
return new SimpleDOMTraversalContext(item);
}
- @Override
- protected void doDestroy() {
- elementNames = null;
-
- super.doDestroy();
- }
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractXSLProcessingStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractXSLProcessingStage.java
index 09f2ba3..1cd5132 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractXSLProcessingStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractXSLProcessingStage.java
@@ -257,18 +257,6 @@ public abstract class AbstractXSLProcessingStage extends AbstractStage<Element>
@Nonnull @NonnullElements final Collection<Item<Element>> items) throws StageProcessingException,
TransformerConfigurationException;
- @Override
- protected void doDestroy() {
- xslResource = null;
- xslTemplate = null;
- transformAttributes = null;
- transformFeatures = null;
- transformParameters = null;
- uriResolver = null;
-
- super.doDestroy();
- }
-
@Override
protected void doInitialize() throws ComponentInitializationException {
super.doInitialize();
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/DOMFilesystemSourceStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/DOMFilesystemSourceStage.java
index 0a7514a..d379f50 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/DOMFilesystemSourceStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/DOMFilesystemSourceStage.java
@@ -292,15 +292,6 @@ public class DOMFilesystemSourceStage extends AbstractStage<Element> {
}
}
- @Override
- protected void doDestroy() {
- parserPool = null;
- sourceFile = null;
- sourceFileFilter = null;
-
- super.doDestroy();
- }
-
@Override
protected void doInitialize() throws ComponentInitializationException {
super.doInitialize();
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/DOMResourceSourceStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/DOMResourceSourceStage.java
index da8634c..0172628 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/DOMResourceSourceStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/DOMResourceSourceStage.java
@@ -174,14 +174,6 @@ public class DOMResourceSourceStage extends AbstractStage<Element> {
}
}
- @Override
- protected void doDestroy() {
- domResource = null;
- parserPool = null;
-
- super.doDestroy();
- }
-
@Override
protected void doInitialize() throws ComponentInitializationException {
super.doInitialize();
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/ElementStrippingStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/ElementStrippingStage.java
index ff452ac..3a732cf 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/ElementStrippingStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/ElementStrippingStage.java
@@ -113,14 +113,6 @@ public class ElementStrippingStage extends AbstractIteratingStage<Element> {
}
}
- @Override
- protected void doDestroy() {
- elementNamespace = null;
- elementName = null;
-
- super.doDestroy();
- }
-
@Override
protected void doInitialize() throws ComponentInitializationException {
super.doInitialize();
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/ElementsStrippingStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/ElementsStrippingStage.java
index e07dee5..027ed70 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/ElementsStrippingStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/ElementsStrippingStage.java
@@ -226,14 +226,6 @@ public class ElementsStrippingStage extends AbstractDOMTraversalStage<ElementsSt
context.add(element);
}
- @Override
- protected void doDestroy() {
- elementNamespace = null;
- elementNames = null;
-
- super.doDestroy();
- }
-
@Override
protected void doInitialize() throws ComponentInitializationException {
super.doInitialize();
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/EmptyContainerStrippingStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/EmptyContainerStrippingStage.java
index 86c9cab..129d4cf 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/EmptyContainerStrippingStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/EmptyContainerStrippingStage.java
@@ -118,14 +118,6 @@ public class EmptyContainerStrippingStage extends AbstractIteratingStage<Element
}
}
- @Override
- protected void doDestroy() {
- elementNamespace = null;
- elementName = null;
-
- super.doDestroy();
- }
-
@Override
protected void doInitialize() throws ComponentInitializationException {
super.doInitialize();
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/NamespaceStrippingStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/NamespaceStrippingStage.java
index 9e13c6e..1121254 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/NamespaceStrippingStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/NamespaceStrippingStage.java
@@ -67,13 +67,6 @@ public class NamespaceStrippingStage extends AbstractNamespacesStrippingStage {
return getNamespace().equals(ns);
}
- @Override
- protected void doDestroy() {
- namespace = null;
-
- super.doDestroy();
- }
-
@Override
protected void doInitialize() throws ComponentInitializationException {
super.doInitialize();
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/NamespacesStrippingStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/NamespacesStrippingStage.java
index b56695e..f7667cc 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/NamespacesStrippingStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/NamespacesStrippingStage.java
@@ -109,11 +109,4 @@ public class NamespacesStrippingStage extends AbstractNamespacesStrippingStage {
return isWhitelisting() ^ getNamespaces().contains(namespace);
}
- @Override
- protected void doDestroy() {
- namespaces = null;
-
- super.doDestroy();
- }
-
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/XMLSchemaValidationStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/XMLSchemaValidationStage.java
index b8c0958..f207417 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/XMLSchemaValidationStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/XMLSchemaValidationStage.java
@@ -146,14 +146,6 @@ public class XMLSchemaValidationStage extends AbstractIteratingStage<Element> {
}
}
- @Override
- protected void doDestroy() {
- schemaResources = null;
- validationSchema = null;
-
- super.doDestroy();
- }
-
@Override
protected void doInitialize() throws ComponentInitializationException {
super.doInitialize();
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/XMLSignatureSigningStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/XMLSignatureSigningStage.java
index 11f56cb..578e5c9 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/XMLSignatureSigningStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/XMLSignatureSigningStage.java
@@ -520,19 +520,6 @@ public class XMLSignatureSigningStage extends AbstractStage<Element> {
}
}
- @Override
- protected void doDestroy() {
- privKey = null;
- publicKey = null;
- certificates = null;
- crls = null;
- inclusivePrefixList = null;
- idAttributeNames = null;
- keyNames = null;
-
- super.doDestroy();
- }
-
@Override
protected void doInitialize() throws ComponentInitializationException {
super.doInitialize();
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/XMLSignatureValidationStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/XMLSignatureValidationStage.java
index e2391ff..f7a8dea 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/XMLSignatureValidationStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/XMLSignatureValidationStage.java
@@ -293,16 +293,6 @@ public class XMLSignatureValidationStage extends AbstractStage<Element> {
}
}
- @Override
- protected void doDestroy() {
- verificationCertificate = null;
- verificationKey = null;
- blacklistedDigests = null;
- blacklistedSignatureMethods = null;
-
- super.doDestroy();
- }
-
@Override
protected void doInitialize() throws ComponentInitializationException {
super.doInitialize();
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/XPathFilteringStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/XPathFilteringStage.java
index edfee3c..116a6d8 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/XPathFilteringStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/XPathFilteringStage.java
@@ -144,14 +144,6 @@ public class XPathFilteringStage extends AbstractStage<Element> {
}
}
- @Override
- protected void doDestroy() {
- xpathExpression = null;
- namespaceContext = null;
-
- super.doDestroy();
- }
-
@Override
protected void doInitialize() throws ComponentInitializationException {
super.doInitialize();
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/ds/X509ValidationStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/ds/X509ValidationStage.java
index 98e53d8..d46137e 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/ds/X509ValidationStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/ds/X509ValidationStage.java
@@ -141,10 +141,4 @@ public class X509ValidationStage extends AbstractDOMValidationStage<X509Certific
}
}
- @Override
- protected void doDestroy() {
- factory = null;
- super.doDestroy();
- }
-
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStage.java
index 86827d0..1900746 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStage.java
@@ -226,9 +226,4 @@ public class ContactPersonFilterStage extends AbstractIteratingStage<Element> {
return false;
}
- @Override
- protected void doDestroy() {
- designatedTypes = null;
- super.doDestroy();
- }
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage.java
index 058e478..c74ba4a 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage.java
@@ -187,12 +187,4 @@ public class EntitiesDescriptorAssemblerStage extends AbstractStage<Element> {
}
}
- @Override
- protected void doDestroy() {
- itemOrderingStrategy = null;
- descriptorName = null;
-
- super.doDestroy();
- }
-
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/EntityFilterStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/EntityFilterStage.java
index ef59845..d206f92 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/EntityFilterStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/EntityFilterStage.java
@@ -198,11 +198,4 @@ public class EntityFilterStage extends AbstractFilteringStage<Element> {
return false;
}
- @Override
- protected void doDestroy() {
- designatedEntities = null;
-
- super.doDestroy();
- }
-
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/EntityRoleFilterStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/EntityRoleFilterStage.java
index 8888bea..c1ac8dd 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/EntityRoleFilterStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/EntityRoleFilterStage.java
@@ -284,11 +284,4 @@ public class EntityRoleFilterStage extends AbstractFilteringStage<Element> {
return childElements;
}
- @Override
- protected void doDestroy() {
- designatedRoles = null;
-
- super.doDestroy();
- }
-
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage.java
index 2604492..7a6553b 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage.java
@@ -394,11 +394,4 @@ public class EntityAttributeFilteringStage extends AbstractIteratingStage<Elemen
}
}
- @Override
- protected void doDestroy() {
- rules = null;
-
- super.doDestroy();
- }
-
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/EntityRegistrationAuthorityFilterStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/EntityRegistrationAuthorityFilterStage.java
index 1cf5cc3..a722e75 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/EntityRegistrationAuthorityFilterStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/EntityRegistrationAuthorityFilterStage.java
@@ -254,11 +254,4 @@ public class EntityRegistrationAuthorityFilterStage extends AbstractFilteringSta
return false;
}
- @Override
- protected void doDestroy() {
- designatedAuthorities = null;
-
- super.doDestroy();
- }
-
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/AbstractItemMetadataSelectionStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/AbstractItemMetadataSelectionStage.java
index 633592b..091c618 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/AbstractItemMetadataSelectionStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/AbstractItemMetadataSelectionStage.java
@@ -120,14 +120,6 @@ public abstract class AbstractItemMetadataSelectionStage<T, B> extends AbstractS
}
}
- @Override
- protected void doDestroy() {
- selectionRequirements = null;
- identificationStrategy = null;
-
- super.doDestroy();
- }
-
/**
* Performs the stage's logic on the given item that contained metadata of the given type.
*
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/CompositeStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/CompositeStage.java
index dba6248..89b9b68 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/CompositeStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/CompositeStage.java
@@ -70,10 +70,4 @@ public class CompositeStage<T> extends AbstractStage<T> {
}
}
- @Override
- protected void doDestroy() {
- composedStages = null;
-
- super.doDestroy();
- }
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/FilesInDirectoryMultiOutputStrategy.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/FilesInDirectoryMultiOutputStrategy.java
index 7a546cc..25eccd1 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/FilesInDirectoryMultiOutputStrategy.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/FilesInDirectoryMultiOutputStrategy.java
@@ -199,16 +199,6 @@ public class FilesInDirectoryMultiOutputStrategy<T> extends BaseInitializableCom
return new FileDestination(outputFile);
}
- @Override
- protected void doDestroy() {
- namePrefix = null;
- nameTransformer = null;
- nameSuffix = null;
- directory = null;
-
- super.doDestroy();
- }
-
@Override
protected void doInitialize() throws ComponentInitializationException {
super.doInitialize();
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/ItemOrderingStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/ItemOrderingStage.java
index 230adb6..1563cfc 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/ItemOrderingStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/ItemOrderingStage.java
@@ -70,11 +70,4 @@ public class ItemOrderingStage<T> extends AbstractStage<T> {
items.addAll(orderedItems);
}
- @Override
- protected void doDestroy() {
- orderingStrategy = null;
-
- super.doDestroy();
- }
-
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/MultiOutputSerializationStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/MultiOutputSerializationStage.java
index 85a42e5..e262f47 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/MultiOutputSerializationStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/MultiOutputSerializationStage.java
@@ -150,14 +150,6 @@ public class MultiOutputSerializationStage<T> extends AbstractIteratingStage<T>
}
}
- @Override
- protected void doDestroy() {
- outputStrategy = null;
- serializer = null;
-
- super.doDestroy();
- }
-
@Override
protected void doInitialize() throws ComponentInitializationException {
super.doInitialize();
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStage.java
index 7a08860..217665d 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStage.java
@@ -191,15 +191,6 @@ public class PipelineDemultiplexerStage<T> extends AbstractStage<T> {
}
}
- @Override
- protected void doDestroy() {
- executorService = null;
- collectionFactory = null;
- pipelineAndStrategies = null;
-
- super.doDestroy();
- }
-
@Override
protected void doInitialize() throws ComponentInitializationException {
super.doInitialize();
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/PipelineMergeStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/PipelineMergeStage.java
index 04e63d1..e144e28 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/PipelineMergeStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/PipelineMergeStage.java
@@ -167,16 +167,6 @@ public class PipelineMergeStage<T> extends AbstractStage<T> {
getCollectionMergeStrategy().merge(items, pipelineResults);
}
- @Override
- protected void doDestroy() {
- executorService = null;
- collectionFactory = null;
- mergeStrategy = null;
- mergedPipelines = null;
-
- super.doDestroy();
- }
-
@Override
protected void doInitialize() throws ComponentInitializationException {
super.doInitialize();
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/SerializationStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/SerializationStage.java
index 06708cd..880294a 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/SerializationStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/SerializationStage.java
@@ -177,12 +177,4 @@ public class SerializationStage<T> extends AbstractStage<T> {
}
- @Override
- protected void doDestroy() {
- outputFile = null;
- serializer = null;
-
- super.doDestroy();
- }
-
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/SimplePipeline.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/SimplePipeline.java
index 684786b..72c0829 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/SimplePipeline.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/SimplePipeline.java
@@ -77,13 +77,6 @@ public class SimplePipeline<T> extends BaseIdentifiableInitializableComponent
}
}
- @Override
- protected void doDestroy() {
- pipelineStages = null;
-
- super.doDestroy();
- }
-
@Override
protected void doInitialize() throws ComponentInitializationException {
super.doInitialize();
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/SplitMergeStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/SplitMergeStage.java
index 97c0776..3f8596e 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/SplitMergeStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/SplitMergeStage.java
@@ -261,18 +261,6 @@ public class SplitMergeStage<T> extends AbstractStage<T> {
return getExecutorService().submit(callable);
}
- @Override
- protected void doDestroy() {
- executorService = null;
- collectionFactory = null;
- selectionStrategy = null;
- selectedItemPipeline = null;
- nonselectedItemPipeline = null;
- mergeStrategy = null;
-
- super.doDestroy();
- }
-
@Override
protected void doInitialize() throws ComponentInitializationException {
super.doInitialize();
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/StaticItemSourceStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/StaticItemSourceStage.java
index c990d78..0b8bb56 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/StaticItemSourceStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/StaticItemSourceStage.java
@@ -68,10 +68,4 @@ public class StaticItemSourceStage<T> extends AbstractStage<T> {
}
}
- @Override
- protected void doDestroy() {
- source = null;
-
- super.doDestroy();
- }
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/validate/ValidatorSequence.java b/mda-framework/src/main/java/net/shibboleth/metadata/validate/ValidatorSequence.java
index 195a5ec..fbc7aaf 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/validate/ValidatorSequence.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/validate/ValidatorSequence.java
@@ -81,12 +81,6 @@ public class ValidatorSequence<V> extends BaseValidator implements Validator<V>
return Action.CONTINUE;
}
- @Override
- protected void doDestroy() {
- validators = null;
- super.doDestroy();
- }
-
@Override
protected void doInitialize() throws ComponentInitializationException {
super.doInitialize();
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidator.java b/mda-framework/src/main/java/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidator.java
index 4de252c..e742019 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidator.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidator.java
@@ -186,7 +186,7 @@ public class X509RSAOpenSSLBlacklistValidator extends AbstractX509Validator {
@Override
protected void doDestroy() {
- blacklistResource = null;
+ // We don't need references to the individual values any more.
blacklistedValues.clear();
super.doDestroy();
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list