Skip to content

Commit 4d56ba6

Browse files
committed
Fix null pointer in services
1 parent eaa91f4 commit 4d56ba6

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

operator/src/main/java/oracle/kubernetes/operator/helpers/ServiceHelper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ protected V1ServiceSpec createServiceSpec() {
117117

118118
protected List<V1ServicePort> createServicePorts() {
119119
List<V1ServicePort> ports = new ArrayList<>();
120-
if (scan != null) {
120+
if (scan != null && scan.getNetworkAccessPoints() != null) {
121121
for (NetworkAccessPoint nap : scan.getNetworkAccessPoints()) {
122122
V1ServicePort port =
123123
new V1ServicePort()
@@ -869,7 +869,7 @@ private int searchAdminChannelPort(String channel) {
869869
return serverConfig.getSslListenPort();
870870
} /*else if("adminSecure".equals(channel) && serverConfig.isAdminPortEnabled()){
871871
return serverConfig.getAdminPort();
872-
}*/ else {
872+
}*/ else if (serverConfig.getNetworkAccessPoints() != null) {
873873
for (NetworkAccessPoint nap : serverConfig.getNetworkAccessPoints()) {
874874
if (nap.getName().equals(channel)) {
875875
return nap.getListenPort();

operator/src/main/java/oracle/kubernetes/operator/steps/ExternalAdminChannelsStep.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,13 @@ public static Collection<NetworkAccessPoint> adminChannelsToCreate(
6767
// Pick out externalized channels from the server channels list
6868
for (String incomingChannel : dom.getExportedNetworkAccessPointNames()) {
6969
boolean missingChannel = true;
70-
for (NetworkAccessPoint nap : naps) {
71-
if (nap.getName().equalsIgnoreCase(incomingChannel)) {
72-
missingChannel = false;
73-
channels.add(nap);
74-
break;
70+
if (naps != null) {
71+
for (NetworkAccessPoint nap : naps) {
72+
if (nap.getName().equalsIgnoreCase(incomingChannel)) {
73+
missingChannel = false;
74+
channels.add(nap);
75+
break;
76+
}
7577
}
7678
}
7779
if (missingChannel) {

0 commit comments

Comments
 (0)