UBO-373 Fixed NullPointerException, store realm attribute of user in …

…MCRJob (#438)
MyCoRe-Org · Nov 28, 2024 · e4b4a5c · e4b4a5c
1 parent e72137a
commit e4b4a5c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/ubo-common/src/main/java/org/mycore/ubo/importer/DozBibImportServlet.java b/ubo-common/src/main/java/org/mycore/ubo/importer/DozBibImportServlet.java
@@ -55,7 +55,8 @@ private void handleImportJob(HttpServletRequest req, HttpServletResponse res) th
         if ("true".equals(doAsync)) {
             MCRJob job = new MCRJob(ImportListJobAction.class);
             job.setParameter(ImportListJobAction.EDITOR_SUBMISSION_PARAMETER, new XMLOutputter().outputString(doc));
-            job.setParameter(ImportListJobAction.USER_ID_PARAMETER, MCRUserManager.getCurrentUser().getUserName());
+            job.setParameter(ImportListJobAction.USER_ID_PARAMETER,
+                MCRUserManager.getCurrentUser().getUserName() + "@" + MCRUserManager.getCurrentUser().getRealmID());
             MCRJobQueueManager.getInstance().getJobQueue(ImportListJobAction.class).offer(job);
 
             String referer = req.getHeader("Referer");

diff --git a/ubo-common/src/main/java/org/mycore/ubo/importer/ImportListJobAction.java b/ubo-common/src/main/java/org/mycore/ubo/importer/ImportListJobAction.java
@@ -79,6 +79,12 @@ public void execute() throws ExecutionException {
     private void sendMail(ImportJob importJob) {
         String userName = job.getParameter(ImportListJobAction.USER_ID_PARAMETER);
         MCRUser mcrUser = MCRUserManager.getUser(userName);
+
+        if(mcrUser == null) {
+            LOGGER.error("User {} not found", userName);
+            return;
+        }
+
         String eMailAddress = mcrUser.getEMailAddress();
 
         if (eMailAddress == null) {