Skip to content

Commit d39866d

Browse files
committed
Address review comments
1 parent df093f4 commit d39866d

File tree

4 files changed

+14
-5
lines changed

4 files changed

+14
-5
lines changed

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,15 @@ public NextAction apply(Packet packet) {
145145
}
146146

147147
private static boolean runIntrospector(Packet packet, DomainPresenceInfo info) {
148-
WlsDomainConfig config = (WlsDomainConfig) packet.get(ProcessingConstants.DOMAIN_TOPOLOGY);
149-
LOGGER.fine("runIntrospector topology: " + config);
148+
WlsDomainConfig topology = (WlsDomainConfig) packet.get(ProcessingConstants.DOMAIN_TOPOLOGY);
149+
LOGGER.fine("runIntrospector topology: " + topology);
150150
LOGGER.fine("runningServersCount: " + runningServersCount(info));
151151
LOGGER.fine("creatingServers: " + creatingServers(info));
152-
return config == null || (runningServersCount(info) == 0 && creatingServers(info));
152+
return topology == null || isBringingUpNewDomain(info);
153+
}
154+
155+
private static boolean isBringingUpNewDomain(DomainPresenceInfo info) {
156+
return runningServersCount(info) == 0 && creatingServers(info);
153157
}
154158

155159
private static int runningServersCount(DomainPresenceInfo info) {

operator/src/main/java/oracle/kubernetes/operator/logging/LoggingFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2017, Oracle Corporation and/or its affiliates. All rights reserved.
1+
// Copyright 2017, 2019, Oracle Corporation and/or its affiliates. All rights reserved.
22
// Licensed under the Universal Permissive License v 1.0 as shown at
33
// http://oss.oracle.com/licenses/upl.
44

operator/src/test/java/oracle/kubernetes/operator/JobWatcherTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2018, Oracle Corporation and/or its affiliates. All rights reserved.
1+
// Copyright 2018, 2019, Oracle Corporation and/or its affiliates. All rights reserved.
22
// Licensed under the Universal Permissive License v 1.0 as shown at
33
// http://oss.oracle.com/licenses/upl.
44

operator/src/test/java/oracle/kubernetes/operator/work/FiberTestSupport.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,11 @@ public boolean hasItemScheduledAt(int time, TimeUnit unit) {
8686
return schedule.containsItemAt(time, unit);
8787
}
8888

89+
/**
90+
* Returns the engine used by this support object.
91+
*
92+
* @return the current engine object
93+
*/
8994
public Engine getEngine() {
9095
return engine;
9196
}

0 commit comments

Comments
 (0)