[openmeetings] branch master updated: [OPENMEETINGS-1856] some more sonar issues are addressed

[solomax]

This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/master by this push:
     new 2330456  [OPENMEETINGS-1856] some more sonar issues are addressed
2330456 is described below

commit 2330456ab6c2580dd9abc28a799dea4e5c24d298
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Thu Oct 11 18:00:52 2018 +0700

    [OPENMEETINGS-1856] some more sonar issues are addressed
---
 .../openmeetings/core/converter/InterviewConverter.java       | 11 +++++------
 .../org/apache/openmeetings/web/room/menu/PollsSubMenu.java   |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java
 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java
index ba5b17a..95a66b6 100644
--- 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java
+++ 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java
@@ -58,7 +58,11 @@ public class InterviewConverter extends BaseConverter 
implements IRecordingConve
 
        @Override
        public void startConversion(Long id) {
-               Recording r = null;
+               Recording r = recordingDao.get(id);
+               if (r == null) {
+                       log.warn("Conversion is NOT started. Recording with ID 
{} is not found", id);
+                       return;
+               }
                ProcessResultList logs = new ProcessResultList();
                List<File> waveFiles = new ArrayList<>();
                try {
@@ -68,11 +72,6 @@ public class InterviewConverter extends BaseConverter 
implements IRecordingConve
                                throw new 
ConversionException("defaultInterviewImageFile does not exist!");
                        }
 
-                       r = recordingDao.get(id);
-                       if (r == null) {
-                               log.warn("Unable to get REcording by id {}, 
will interrupt conversion", id);
-                               return;
-                       }
                        log.debug("recording {}", r.getId());
                        if (Strings.isEmpty(r.getHash())) {
                                r.setHash(UUID.randomUUID().toString());
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/PollsSubMenu.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/PollsSubMenu.java
index bcd0745..e86e690 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/PollsSubMenu.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/PollsSubMenu.java
@@ -157,7 +157,7 @@ public class PollsSubMenu implements Serializable {
                        return;
                }
                boolean pollExists = pollDao.hasPoll(r.getId());
-               pollsMenu.setEnabled((moder && visible) || (!moder && 
r.isAllowUserQuestions()));
+               pollsMenu.setEnabled(moder || r.isAllowUserQuestions());
                
pollQuickMenuItem.setEnabled(room.getClient().hasRight(Room.Right.presenter) && 
!qpollManager.isStarted(r.getId()));
                pollCreateMenuItem.setEnabled(moder);
                pollVoteMenuItem.setEnabled(pollExists && notExternalUser && 
!pollDao.hasVoted(r.getId(), getUserId()));