From 89f8054c366124910a1bdf70bb3a5a4e906e82de Mon Sep 17 00:00:00 2001 From: Thomas Florio Date: Wed, 9 Aug 2023 11:11:04 +0200 Subject: [PATCH] Fixed handling of null credentials --- .../src/com/redhat/rhn/manager/content/ContentSyncManager.java | 3 ++- ...ewalk-java.changes.mackdk.4.3-fix-null-credentials-handling | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 java/spacewalk-java.changes.mackdk.4.3-fix-null-credentials-handling diff --git a/java/code/src/com/redhat/rhn/manager/content/ContentSyncManager.java b/java/code/src/com/redhat/rhn/manager/content/ContentSyncManager.java index c8179742752c..aa273e1bd7f0 100644 --- a/java/code/src/com/redhat/rhn/manager/content/ContentSyncManager.java +++ b/java/code/src/com/redhat/rhn/manager/content/ContentSyncManager.java @@ -1666,7 +1666,8 @@ private List loadStaticTree(String tag) throws ContentSyncExce } // If we have only RMT credentials - if (!credentials.isEmpty() && credentials.stream().allMatch(c -> c.isTypeOf(Credentials.TYPE_CLOUD_RMT))) { + if (!credentials.isEmpty() && + credentials.stream().allMatch(c -> c != null && c.isTypeOf(Credentials.TYPE_CLOUD_RMT))) { // Remove Ubuntu and Debian products until RMT supports them tree.removeIf(productEntry -> productEntry.getChannelLabel().contains("amd64") || productEntry.getParentChannelLabel().filter(label -> label.contains("amd64")).isPresent()); diff --git a/java/spacewalk-java.changes.mackdk.4.3-fix-null-credentials-handling b/java/spacewalk-java.changes.mackdk.4.3-fix-null-credentials-handling new file mode 100644 index 000000000000..159d0bb4da3f --- /dev/null +++ b/java/spacewalk-java.changes.mackdk.4.3-fix-null-credentials-handling @@ -0,0 +1 @@ +- Fixed handling of null credentials in RMT credentials check