Skip to content

Commit dafc719

Browse files
committed
Use null for effective log home when not set
1 parent 31f3257 commit dafc719

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ protected boolean isDomainHomeInImage() {
9999
}
100100

101101
String getEffectiveLogHome() {
102-
if (!getDomain().getLogHomeEnabled()) return "";
102+
if (!getDomain().getLogHomeEnabled()) return null;
103103
String logHome = getLogHome();
104104
if (logHome == null || "".equals(logHome.trim())) {
105105
// logHome not specified, use default value

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ protected boolean isDomainHomeInImage() {
143143
}
144144

145145
String getEffectiveLogHome() {
146-
if (!getDomain().getLogHomeEnabled()) return "";
146+
if (!getDomain().getLogHomeEnabled()) return null;
147147
String logHome = getLogHome();
148148
if (logHome == null || "".equals(logHome.trim())) {
149149
// logHome not specified, use default value

operator/src/test/java/oracle/kubernetes/operator/helpers/PodHelperTestBase.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ public void whenPodCreated_hasPredefinedEnvVariables() {
326326
hasEnvVar("DOMAIN_UID", UID),
327327
hasEnvVar("NODEMGR_HOME", NODEMGR_HOME),
328328
hasEnvVar("SERVER_OUT_IN_POD_LOG", Boolean.toString(INCLUDE_SERVER_OUT_IN_POD_LOG)),
329-
hasEnvVar("LOG_HOME", ""),
329+
hasEnvVar("LOG_HOME", null),
330330
hasEnvVar("SERVICE_NAME", LegalNames.toServerServiceName(UID, getServerName())),
331331
hasEnvVar("AS_SERVICE_NAME", LegalNames.toServerServiceName(UID, ADMIN_SERVER))));
332332
}
@@ -622,7 +622,7 @@ V1Container createPodSpecContainer() {
622622
.addEnvItem(envItem("NODEMGR_HOME", NODEMGR_HOME))
623623
.addEnvItem(
624624
envItem("SERVER_OUT_IN_POD_LOG", Boolean.toString(INCLUDE_SERVER_OUT_IN_POD_LOG)))
625-
.addEnvItem(envItem("LOG_HOME", ""))
625+
.addEnvItem(envItem("LOG_HOME", null))
626626
.addEnvItem(envItem("SERVICE_NAME", LegalNames.toServerServiceName(UID, getServerName())))
627627
.addEnvItem(envItem("AS_SERVICE_NAME", LegalNames.toServerServiceName(UID, ADMIN_SERVER)))
628628
.livenessProbe(createLivenessProbe())

0 commit comments

Comments
 (0)