Merge branch 'backport-loghome-mountpath-check' into 'release/4.2'

rjeberhard · rjeberhard · commit 6bbfa37694f7 · 2024-06-11T22:53:20.000Z
Correct logic where one of the mountPath is exactly the same as logHomePath

See merge request weblogic-cloud/weblogic-kubernetes-operator!4727
diff --git a/operator/src/main/java/oracle/kubernetes/weblogic/domain/model/DomainResource.java b/operator/src/main/java/oracle/kubernetes/weblogic/domain/model/DomainResource.java
@@ -1448,7 +1448,7 @@ private void addUnmappedLogHome() {
     }
 
     private boolean mapsLogHome(String mountPath) {
-      return getLogHome().startsWith(separatorTerminated(mountPath));
+      return separatorTerminated(getLogHome()).startsWith(separatorTerminated(mountPath));
     }
 
     private String separatorTerminated(String path) {

Original file line number	Diff line number	Diff line change
`@@ -1448,7 +1448,7 @@ private void addUnmappedLogHome() {`
`1448`	`1448`	`}`
`1449`	`1449`
`1450`	`1450`	`private boolean mapsLogHome(String mountPath) {`
`1451`		`- return getLogHome().startsWith(separatorTerminated(mountPath));`
	`1451`	`+ return separatorTerminated(getLogHome()).startsWith(separatorTerminated(mountPath));`
`1452`	`1452`	`}`
`1453`	`1453`
`1454`	`1454`	`private String separatorTerminated(String path) {`