[openmeetings] branch master updated: [OPENMEETINGS-2733] some Sonar issues

[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 34a2b06d7 [OPENMEETINGS-2733] some Sonar issues
34a2b06d7 is described below

commit 34a2b06d7d83fdf0ceb741429e1083c7701bf2db
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Tue Dec 27 13:21:16 2022 +0700

    [OPENMEETINGS-2733] some Sonar issues
---
 .../apache/openmeetings/web/app/Application.java   | 22 ++++++++++++----------
 .../openmeetings/web/pages/auth/OtpDialog.java     |  4 +---
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
index 8e941b21f..a7905396b 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
@@ -372,16 +372,18 @@ public class Application extends 
AuthenticatedWebApplication implements IApplica
                } catch (Exception err) {
                        log.error("[appStart]", err);
                }
-               { //scope
-                       // warm-up Inject
-                       Client c = new Client(null, 1, null, null);
-                       KStream stream = null;
-                       try {
-                               stream = new 
KStream(c.addStream(Client.StreamType.WEBCAM, Activity.AUDIO_VIDEO), null);
-                       } finally {
-                               if (stream != null) {
-                                       stream.release();
-                               }
+               warmup();
+       }
+
+       private void warmup() {
+               // warm-up Inject
+               Client c = new Client(null, 1, null, null);
+               KStream stream = null;
+               try {
+                       stream = new 
KStream(c.addStream(Client.StreamType.WEBCAM, Activity.AUDIO_VIDEO), null);
+               } finally {
+                       if (stream != null) {
+                               stream.release();
                        }
                }
        }
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/OtpDialog.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/OtpDialog.java
index ae13b8df5..968d3d636 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/OtpDialog.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/OtpDialog.java
@@ -165,9 +165,7 @@ public class OtpDialog extends Modal<User> {
                        String otp = otpField.getConvertedInput();
                        try {
                                Integer.valueOf(otp);
-                               if (otpManager.verify(u.getOtpSecret(), otp)) {
-                                       return;
-                               } else {
+                               if (!otpManager.verify(u.getOtpSecret(), otp)) {
                                        error(getString("otp.invalid"));
                                }
                        } catch (NumberFormatException e) {