Skip to content

Commit 411feec

Browse files
authored
Merge pull request #894 from lprimak/fix-casc-default-permissions
bugfix: regression in default permissions strategy initialization in …
2 parents 1afc22a + 6c82994 commit 411feec

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubAppCredentials.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import hudson.util.ListBoxModel;
2222
import hudson.util.Secret;
2323
import java.io.IOException;
24+
import java.io.Serial;
2425
import java.io.Serializable;
2526
import java.security.GeneralSecurityException;
2627
import java.time.Duration;
@@ -596,13 +597,16 @@ long getTokenStaleEpochSeconds() {
596597
}
597598
}
598599

599-
private Object readResolve() {
600+
@Serial
601+
Object readResolve() {
600602
cachedCredentials = new ConcurrentHashMap<>();
601-
if (repositoryAccessStrategy == null || defaultPermissionsStrategy == null) {
603+
if (repositoryAccessStrategy == null) {
602604
setRepositoryAccessStrategy(new AccessSpecifiedRepositories(owner, List.of()));
603-
setDefaultPermissionsStrategy(DefaultPermissionsStrategy.INHERIT_ALL);
604605
MigrationAdminMonitor.addMigratedCredentialId(getId());
605606
}
607+
if (defaultPermissionsStrategy == null) {
608+
setDefaultPermissionsStrategy(DefaultPermissionsStrategy.INHERIT_ALL);
609+
}
606610
owner = null;
607611
context = new GitHubAppUsageContext();
608612
return this;

0 commit comments

Comments
 (0)