Prevent NPE and removed unecessary WARN message.

Author: vertigo17

source/src/main/java/org/cerberus/core/crud/dao/impl/TestDataLibDAO.java

@@ -44,6 +44,7 @@
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.sql.Timestamp;
@@ -1046,7 +1047,7 @@ public TestDataLib loadFromResultSet(ResultSet resultSet) throws SQLException {
             subDataParsingAnswer = ParameterParserUtil.returnEmptyStringIfNull(resultSet.getString("tdd.parsingAnswer"));
             subDataColumnPosition = ParameterParserUtil.returnEmptyStringIfNull(resultSet.getString("tdd.columnPosition"));
         } catch (Exception ex) {
-            LOG.warn(ex.toString());
+            LOG.debug(ex.toString());
         }
 
         return factoryTestDataLib.create(testDataLibID, name, system, environment, country, privateData, group, type, database, script, databaseUrl, service, servicePath,

source/src/main/java/org/cerberus/core/engine/execution/impl/RecorderService.java

@@ -543,38 +543,40 @@ public TestCaseExecutionFile recordExeLog(TestCaseExecution execution) {
         LOG.debug("Starting to save Execution log File.");
 
         TestCaseExecutionFile object = null;
-        String test = execution.getTest();
-        String testCase = execution.getTestCase();
+        if ((execution != null) && (execution.getExecutionLog() != null)) {
+            String test = execution.getTest();
+            String testCase = execution.getTestCase();
 
-        try {
-            Recorder recorder = this.initFilenames(execution.getId(), test, testCase, null, null, null, null, null, 0, "exeLog", "log", false);
-            File dir = new File(recorder.getFullPath());
-            dir.mkdirs();
+            try {
+                Recorder recorder = this.initFilenames(execution.getId(), test, testCase, null, null, null, null, null, 0, "exeLog", "log", false);
+                File dir = new File(recorder.getFullPath());
+                dir.mkdirs();
 
-            File file = new File(recorder.getFullFilename());
+                File file = new File(recorder.getFullFilename());
 
-            try (FileOutputStream fileOutputStream = new FileOutputStream(file);) {
-                for (ExecutionLog executionLog : execution.getExecutionLog()) {
-                    fileOutputStream.write(executionLog.getLogText().getBytes());
-                    fileOutputStream.write("\r\n".getBytes());
-                    LOG.debug(executionLog.getLogText());
-                }
+                try (FileOutputStream fileOutputStream = new FileOutputStream(file);) {
+                    for (ExecutionLog executionLog : execution.getExecutionLog()) {
+                        fileOutputStream.write(executionLog.getLogText().getBytes());
+                        fileOutputStream.write("\r\n".getBytes());
+                        LOG.debug(executionLog.getLogText());
+                    }
 
-                LOG.info("File saved : {}", recorder.getFullFilename());
+                    LOG.info("File saved : {}", recorder.getFullFilename());
 
-                // Index file created to database.
-                object = testCaseExecutionFileFactory.create(0, execution.getId(), recorder.getLevel(), "Execution Log", recorder.getRelativeFilenameURL(), "TXT", "", null, "", null);
-                testCaseExecutionFileService.save(object);
+                    // Index file created to database.
+                    object = testCaseExecutionFileFactory.create(0, execution.getId(), recorder.getLevel(), "Execution Log", recorder.getRelativeFilenameURL(), "TXT", "", null, "", null);
+                    testCaseExecutionFileService.save(object);
 
-            } catch (IOException ex) {
+                } catch (IOException ex) {
+                    LOG.error(ex.toString(), ex);
+                } catch (WebDriverException ex) {
+                    LOG.debug("Exception recording execution log on execution : {}", execution.getId(), ex);
+                    object = testCaseExecutionFileFactory.create(0, execution.getId(), recorder.getLevel(), "Execution Log [ERROR]", recorder.getRelativeFilenameURL(), "TXT", "", null, "", null);
+                    testCaseExecutionFileService.save(object);
+                }
+            } catch (CerberusException ex) {
                 LOG.error(ex.toString(), ex);
-            } catch (WebDriverException ex) {
-                LOG.debug("Exception recording execution log on execution : {}", execution.getId(), ex);
-                object = testCaseExecutionFileFactory.create(0, execution.getId(), recorder.getLevel(), "Execution Log [ERROR]", recorder.getRelativeFilenameURL(), "TXT", "", null, "", null);
-                testCaseExecutionFileService.save(object);
             }
-        } catch (CerberusException ex) {
-            LOG.error(ex.toString(), ex);
         }
         return object;