From e10612188741a2d5ce9c69b80c35015b38ea1627 Mon Sep 17 00:00:00 2001
From: Ola Aunronning <olaa@yahooinc.com>
Date: Wed, 26 Apr 2023 12:58:24 +0200
Subject: Revert "Merge pull request #26859 from
 vespa-engine/revert-26805-olaa/versioned-feature-flag"

This reverts commit 01cc25458c74d2902879087919f67622600ffc65, reversing
changes made to a6c5b734b94d0239db9df0d37e390f82d3deabf1.
---
 .../java/com/yahoo/container/jdisc/AthenzIdentityProviderProvider.java | 3 +++
 .../java/com/yahoo/container/jdisc/athenz/AthenzIdentityProvider.java  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'container-disc/src/main/java/com/yahoo/container/jdisc')

diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/AthenzIdentityProviderProvider.java b/container-disc/src/main/java/com/yahoo/container/jdisc/AthenzIdentityProviderProvider.java
index f04e2291ee8..9d2e06ed9da 100644
--- a/container-disc/src/main/java/com/yahoo/container/jdisc/AthenzIdentityProviderProvider.java
+++ b/container-disc/src/main/java/com/yahoo/container/jdisc/AthenzIdentityProviderProvider.java
@@ -89,6 +89,9 @@ public class AthenzIdentityProviderProvider implements Provider<AthenzIdentityPr
         public Path trustStorePath() {
             throw new UnsupportedOperationException(message);
         }
+
+        @Override
+        public void deconstruct() {}
     }
 
 }
diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/AthenzIdentityProvider.java b/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/AthenzIdentityProvider.java
index af5133eceac..46803988b20 100644
--- a/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/AthenzIdentityProvider.java
+++ b/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/AthenzIdentityProvider.java
@@ -24,5 +24,5 @@ public interface AthenzIdentityProvider {
     X509Certificate getRoleCertificate(String domain, String role);
     PrivateKey getPrivateKey();
     Path trustStorePath();
-
+    void deconstruct();
 }
-- 
cgit v1.2.3