check if consoleSession is null at the beginning of the method

Author: bernardodemarco

server/src/main/java/com/cloud/api/ApiResponseHelper.java

@@ -5554,10 +5554,6 @@ public void updateTemplateIsoResponsesForIcons(List<TemplateResponse> responses,
     }
 
     private void populateDomainFieldsOnConsoleSessionResponse(ConsoleSession consoleSession, ConsoleSessionResponse consoleSessionResponse) {
-        if (consoleSession == null) {
-            return;
-        }
-
         Domain domain = ApiDBUtils.findDomainById(consoleSession.getDomainId());
         if (domain != null) {
             consoleSessionResponse.setDomain(domain.getName());
@@ -5567,10 +5563,6 @@ private void populateDomainFieldsOnConsoleSessionResponse(ConsoleSession console
     }
 
     private void populateUserFieldsOnConsoleSessionResponse(ConsoleSession consoleSession, ConsoleSessionResponse consoleSessionResponse) {
-        if (consoleSession == null) {
-            return;
-        }
-
         User user = findUserById(consoleSession.getUserId());
         if (user != null) {
             consoleSessionResponse.setUser(user.getUsername());
@@ -5579,10 +5571,6 @@ private void populateUserFieldsOnConsoleSessionResponse(ConsoleSession consoleSe
     }
 
     private void populateAccountFieldsOnConsoleSessionResponse(ConsoleSession consoleSession, ConsoleSessionResponse consoleSessionResponse) {
-        if (consoleSession == null) {
-            return;
-        }
-
         Account account = ApiDBUtils.findAccountById(consoleSession.getAccountId());
         if (account != null) {
             consoleSessionResponse.setAccount(account.getAccountName());
@@ -5591,10 +5579,6 @@ private void populateAccountFieldsOnConsoleSessionResponse(ConsoleSession consol
     }
 
     private void populateHostFieldsOnConsoleSessionResponse(ConsoleSession consoleSession, ConsoleSessionResponse consoleSessionResponse) {
-        if (consoleSession == null) {
-            return;
-        }
-
         Host host = findHostById(consoleSession.getHostId());
         if (host != null) {
             consoleSessionResponse.setHostId(host.getUuid());
@@ -5603,10 +5587,6 @@ private void populateHostFieldsOnConsoleSessionResponse(ConsoleSession consoleSe
     }
 
     private void populateInstanceFieldsOnConsoleSessionResponse(ConsoleSession consoleSession, ConsoleSessionResponse consoleSessionResponse) {
-        if (consoleSession == null) {
-            return;
-        }
-
         VMInstanceVO instance = ApiDBUtils.findVMInstanceById(consoleSession.getInstanceId());
         if (instance != null) {
             consoleSessionResponse.setInstanceId(instance.getUuid());
@@ -5617,6 +5597,10 @@ private void populateInstanceFieldsOnConsoleSessionResponse(ConsoleSession conso
     @Override
     public ConsoleSessionResponse createConsoleSessionResponse(ConsoleSession consoleSession, ResponseView responseView) {
         ConsoleSessionResponse consoleSessionResponse = new ConsoleSessionResponse();
+        if (consoleSession == null) {
+            return consoleSessionResponse;
+        }
+
         consoleSessionResponse.setId(consoleSession.getUuid());
         consoleSessionResponse.setCreated(consoleSession.getCreated());
         consoleSessionResponse.setAcquired(consoleSession.getAcquired());