Merge pull request #977 from SoftlySplinter/1972-jvmserver-logs

Ensure JVM server logs are saved.
galasa-dev · Aug 15, 2024 · b48e941 · b48e941
2 parents 6c55af7 + 4739dd1
commit b48e941
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 16 deletions.
diff --git a/...gers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/build.gradle b/...gers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/build.gradle
@@ -4,7 +4,7 @@ plugins {
 
 description = 'Galasa CICS/TS Resource Manager'
 
-version = '0.34.0'
+version = '0.37.0'
 
 dependencies {
     api            project (':galasa-managers-cicsts-parent:dev.galasa.cicsts.manager')

diff --git a/...sts.resource.manager/src/main/java/dev/galasa/cicsts/resource/internal/JvmserverImpl.java b/...sts.resource.manager/src/main/java/dev/galasa/cicsts/resource/internal/JvmserverImpl.java
@@ -918,21 +918,13 @@ public void saveToResultsArchive() throws CicsJvmserverResourceException {
 
     @Override
     public void saveToResultsArchive(String rasPath) throws CicsJvmserverResourceException {
-        if (this.jvmprofile != null) {
-            this.jvmprofile.saveToResultsArchive(rasPath);
-        }
-        if (this.jvmLogLog != null) {
-            this.jvmLogLog.saveToResultsArchive(rasPath);
-        }
-        if (this.stdOutLog != null) {
-            this.stdOutLog.saveToResultsArchive(rasPath);
-        }
-        if (this.stdErrLog != null) {
-            this.stdErrLog.saveToResultsArchive(rasPath);
-        }
-        if (this.jvmTraceLog != null) {
-            this.jvmTraceLog.saveToResultsArchive(rasPath);
-        }
+        getJvmprofile().saveToResultsArchive(rasPath);
+
+        getJvmLog().saveToResultsArchive(rasPath);
+        getStdOut().saveToResultsArchive(rasPath);
+        getStdErr().saveToResultsArchive(rasPath);
+        getJvmTrace().saveToResultsArchive(rasPath);
+
         saveDiagnosticsToResultsArchive(rasPath);
         saveJavaLogsToResultsArchive(rasPath);
         if (isLiberty()) {