Skip to content

Commit acb6e08

Browse files
committed
fix bad merge
1 parent c60bbb7 commit acb6e08

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,6 @@ public NextAction apply(Packet packet) {
9999

100100
Scan scan = ScanCache.INSTANCE.lookupScan(info.getNamespace(), info.getDomainUID());
101101
WlsDomainConfig config = scan != null ? scan.getWlsDomainConfig() : null;
102-
for (WlsServerConfig serverConfig : config.getServerConfigs().values()) {
103-
factory.addServerIfNeeded(serverConfig, null);
104-
}
105102

106103
Set<String> clusteredServers = new HashSet<>();
107104

operator/src/test/java/oracle/kubernetes/operator/steps/ManagedServersUpStepTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ public void withStartAllWhenWlsClusterNotInDomainSpec_addClusteredServersToListU
418418
@Test
419419
public void whenWlsClusterNotInDomainSpec_recordServerAndClusterConfigs() {
420420
setCluster1Replicas(3);
421-
// addWlsServers("ms1", "ms2", "ms3", "ms4", "ms5");
421+
addWlsServers("ms1", "ms2", "ms3", "ms4", "ms5");
422422
addWlsCluster("cluster1", "ms1", "ms2", "ms3", "ms4", "ms5");
423423

424424
invokeStep();
@@ -432,7 +432,7 @@ public void whenWlsClusterNotInDomainSpec_recordServerAndClusterConfigs() {
432432
@Test
433433
public void whenWlsClusterNotInDomainSpec_startUpToLimit() {
434434
setCluster1Replicas(3);
435-
// addWlsServers("ms1", "ms2", "ms3", "ms4", "ms5");
435+
addWlsServers("ms1", "ms2", "ms3", "ms4", "ms5");
436436
addWlsCluster("cluster1", "ms1", "ms2", "ms3", "ms4", "ms5");
437437

438438
invokeStep();

0 commit comments

Comments
 (0)