Skip to content

Fix error log during application deletion by reordering cache cleanup #3158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Tharsanan1 wants to merge 1 commit into
base: 6.14.x
Choose a base branch
from
Draft

Fix error log during application deletion by reordering cache cleanup #3158

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ...h/src/main/java/org/wso2/carbon/identity/oauth2/internal/OAuthApplicationMgtListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,14 +209,16 @@ private void deleteAssociatedOAuthApps(ServiceProvider serviceProvider, String t
throws IdentityOAuthAdminException, IdentityOAuth2Exception {

Set<String> associatedOAuthConsumerKeys = getOAuthAppsAssociatedWithApplication(serviceProvider);
// Remove cache entries before deleting OAuth app data, since cache cleanup
// needs to look up app information that would no longer exist after deletion.
removeEntriesFromCache(associatedOAuthConsumerKeys);
Comment on lines +212 to +214
Copy link
Copy Markdown
Contributor

@wso2-engineering wso2-engineering bot Mar 31, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Log Improvement Suggestion No: 1

Suggested change
// Remove cache entries before deleting OAuth app data, since cache cleanup
// needs to look up app information that would no longer exist after deletion.
removeEntriesFromCache(associatedOAuthConsumerKeys);
// Remove cache entries before deleting OAuth app data, since cache cleanup
// needs to look up app information that would no longer exist after deletion.
log.info("Removing cache entries for OAuth apps associated with application: " + serviceProvider.getApplicationName() + ", tenantDomain: " + tenantDomain);
removeEntriesFromCache(associatedOAuthConsumerKeys);

for (String consumerKey : associatedOAuthConsumerKeys) {
if (log.isDebugEnabled()) {
log.debug("Removing OAuth application data for clientId: " + consumerKey + " associated with " +
"application: " + serviceProvider.getApplicationName() + " tenantDomain: " + tenantDomain);
}
OAuth2ServiceComponentHolder.getInstance().getOAuthAdminService().removeOAuthApplicationData(consumerKey);
}
removeEntriesFromCache(associatedOAuthConsumerKeys);
}

public void onPreCreateInbound(ServiceProvider serviceProvider, boolean isUpdate) throws
Expand Down