improve application deletion

Thumimku · Nov 7, 2023 · 433a483 · 433a483
1 parent 904d3ed
commit 433a483
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/...t/src/main/java/org/wso2/carbon/identity/application/mgt/dao/impl/ApplicationDAOImpl.java b/...t/src/main/java/org/wso2/carbon/identity/application/mgt/dao/impl/ApplicationDAOImpl.java
@@ -5393,9 +5393,13 @@ private void deleteAndroidAttestationCredentials(ServiceProvider application)
             throws IdentityApplicationManagementException {
 
         try {
-            ApplicationManagementServiceComponentHolder.getInstance()
-                    .getSecretManager().deleteSecret(APPLICATION_SECRET_TYPE_ANDROID_ATTESTATION_CREDENTIALS,
-                            getAndroidAttestationSecretName(application.getApplicationResourceId()));
+            if (ApplicationManagementServiceComponentHolder.getInstance()
+                    .getSecretManager().isSecretExist(APPLICATION_SECRET_TYPE_ANDROID_ATTESTATION_CREDENTIALS,
+                            getAndroidAttestationSecretName(application.getApplicationResourceId()))) {
+                ApplicationManagementServiceComponentHolder.getInstance()
+                        .getSecretManager().deleteSecret(APPLICATION_SECRET_TYPE_ANDROID_ATTESTATION_CREDENTIALS,
+                                getAndroidAttestationSecretName(application.getApplicationResourceId()));
+            }
         } catch (SecretManagementException e) {
             throw new IdentityApplicationManagementException("Failed to delete Android Attestation " +
                     "Service Credentials for service provider with id: " + application.getApplicationID(), e);