From 5c193ced8595cb81ae16104998dfe868a4900b30 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Thu, 29 Jun 2023 12:47:25 +0200
Subject: [PATCH] Avoid recreating stuff in a loop

---
 .../logic/controller/session/UserBean.java    | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/main/java/no/nibio/vips/logic/controller/session/UserBean.java b/src/main/java/no/nibio/vips/logic/controller/session/UserBean.java
index a35d00bc..2697e876 100755
--- a/src/main/java/no/nibio/vips/logic/controller/session/UserBean.java
+++ b/src/main/java/no/nibio/vips/logic/controller/session/UserBean.java
@@ -642,20 +642,20 @@ public class UserBean {
      */
     public void informAdminOfConfirmedEmail(VipsLogicUser confirmUser, ResourceBundle i18nBundle, String serverName ) {
         List<VipsLogicUser> organizationAdmins = this.findOrganizationUsersByRole(confirmUser.getOrganizationId(), Globals.ROLE_ORGANIZATION_ADMINISTRATOR);
+        String subject = i18nBundle.getString("informAdminOfConfirmedEmailSubject");
+        String body = MessageFormat.format(i18nBundle.getString("informAdminOfConfirmedEmailBody"), 
+                            confirmUser.getLastName(),
+                            confirmUser.getApprovalApplication(),
+                            Globals.PROTOCOL + "://" + serverName + "/user?action=viewUser&userId=" + confirmUser.getUserId(),
+                            Globals.PROTOCOL + "://" + serverName + "/user?action=approveUser&userId=" + confirmUser.getUserId()
+                        );
+
+        //System.out.println(body);
+        // Send email
+        String smtpServer = System.getProperty("no.nibio.vips.logic.SMTP_SERVER");
+        SimpleMailSender mailSender = new SimpleMailSender(smtpServer);
         for(VipsLogicUser organizationAdmin: organizationAdmins)
         {
-            String subject = i18nBundle.getString("informAdminOfConfirmedEmailSubject");
-            String body = MessageFormat.format(i18nBundle.getString("informAdminOfConfirmedEmailBody"), 
-                                confirmUser.getLastName(),
-                                confirmUser.getApprovalApplication(),
-                                Globals.PROTOCOL + "://" + serverName + "/user?action=viewUser&userId=" + confirmUser.getUserId(),
-                                Globals.PROTOCOL + "://" + serverName + "/user?action=approveUser&userId=" + confirmUser.getUserId()
-                            );
-            
-            //System.out.println(body);
-            // Send email
-            String smtpServer = System.getProperty("no.nibio.vips.logic.SMTP_SERVER");
-            SimpleMailSender mailSender = new SimpleMailSender(smtpServer);
             mailSender.sendMail("noreply@" + serverName, organizationAdmin.getEmail(), subject, body);
         }
     }
-- 
GitLab