From ef5fb812bf9c85ed4e5ad3b262dc1fbbf098fa23 Mon Sep 17 00:00:00 2001
From: jshum2479 <johnny.shum@oracle.com>
Date: Mon, 3 May 2021 11:36:50 -0500
Subject: [PATCH 1/4] compareModel.sh does not generate compare_model_stdout if
 there is a code failure.

---
 operator/src/main/resources/scripts/modelInImage.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/operator/src/main/resources/scripts/modelInImage.sh b/operator/src/main/resources/scripts/modelInImage.sh
index 5c9c70fd1bc..b47b616a1d9 100755
--- a/operator/src/main/resources/scripts/modelInImage.sh
+++ b/operator/src/main/resources/scripts/modelInImage.sh
@@ -613,7 +613,7 @@ function diff_model() {
   ret=$?
   if [ $ret -ne 0 ]; then
     trace SEVERE "WDT Compare Model failed:"
-    cat /tmp/compare_model_stdout
+    cat ${WDT_ROOT}/logs/compareModel.log
     exitOrLoop
   fi
 

From c2d251fb00f61976c51515113062583b07f45846 Mon Sep 17 00:00:00 2001
From: jshum2479 <johnny.shum@oracle.com>
Date: Mon, 3 May 2021 11:53:15 -0500
Subject: [PATCH 2/4] use stdout for readibility

---
 operator/src/main/resources/scripts/modelInImage.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/operator/src/main/resources/scripts/modelInImage.sh b/operator/src/main/resources/scripts/modelInImage.sh
index b47b616a1d9..a8c2da7d756 100755
--- a/operator/src/main/resources/scripts/modelInImage.sh
+++ b/operator/src/main/resources/scripts/modelInImage.sh
@@ -609,11 +609,11 @@ function diff_model() {
   # $1 - new model, $2 original model
 
   # no need to redirect output, -output_dir for compareModel will generate the output file
-  ${WDT_BINDIR}/compareModel.sh -oracle_home ${ORACLE_HOME} -output_dir /tmp $1 $2 > /dev/null 2>&1
+  ${WDT_BINDIR}/compareModel.sh -oracle_home ${ORACLE_HOME} -output_dir /tmp $1 $2 >  ${WDT_OUTPUT} 2>&1
   ret=$?
   if [ $ret -ne 0 ]; then
     trace SEVERE "WDT Compare Model failed:"
-    cat ${WDT_ROOT}/logs/compareModel.log
+    cat ${WDT_OUTPUT}
     exitOrLoop
   fi
 

From fc0caeefd44be29dc45cce423c593e269c24009b Mon Sep 17 00:00:00 2001
From: Tom Barnes <tom.barnes@oracle.com>
Date: Mon, 3 May 2021 13:59:33 -0400
Subject: [PATCH 3/4] Update modelInImage.sh

Remove outdated comment
---
 operator/src/main/resources/scripts/modelInImage.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/operator/src/main/resources/scripts/modelInImage.sh b/operator/src/main/resources/scripts/modelInImage.sh
index a8c2da7d756..4295d3069cf 100755
--- a/operator/src/main/resources/scripts/modelInImage.sh
+++ b/operator/src/main/resources/scripts/modelInImage.sh
@@ -608,7 +608,6 @@ function diff_model() {
   export __WLSDEPLOY_STORE_MODEL__=1
   # $1 - new model, $2 original model
 
-  # no need to redirect output, -output_dir for compareModel will generate the output file
   ${WDT_BINDIR}/compareModel.sh -oracle_home ${ORACLE_HOME} -output_dir /tmp $1 $2 >  ${WDT_OUTPUT} 2>&1
   ret=$?
   if [ $ret -ne 0 ]; then

From 16fb25baf3f001f50712deb7bfa37096e14891bb Mon Sep 17 00:00:00 2001
From: jshum2479 <johnny.shum@oracle.com>
Date: Tue, 4 May 2021 10:34:23 -0500
Subject: [PATCH 4/4] remove space

---
 operator/src/main/resources/scripts/modelInImage.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/operator/src/main/resources/scripts/modelInImage.sh b/operator/src/main/resources/scripts/modelInImage.sh
index 4295d3069cf..2424921e4de 100755
--- a/operator/src/main/resources/scripts/modelInImage.sh
+++ b/operator/src/main/resources/scripts/modelInImage.sh
@@ -608,7 +608,7 @@ function diff_model() {
   export __WLSDEPLOY_STORE_MODEL__=1
   # $1 - new model, $2 original model
 
-  ${WDT_BINDIR}/compareModel.sh -oracle_home ${ORACLE_HOME} -output_dir /tmp $1 $2 >  ${WDT_OUTPUT} 2>&1
+  ${WDT_BINDIR}/compareModel.sh -oracle_home ${ORACLE_HOME} -output_dir /tmp $1 $2 > ${WDT_OUTPUT} 2>&1
   ret=$?
   if [ $ret -ne 0 ]; then
     trace SEVERE "WDT Compare Model failed:"