From 06a026a1c6f11b57ad4639ba48219b7925904dfd Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Tue, 24 Mar 2020 09:08:09 +0100
Subject: [PATCH] Bugfix: Allowing regular user to change their info
---
.../nibio/vips/logic/controller/servlet/UserController.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/main/java/no/nibio/vips/logic/controller/servlet/UserController.java b/src/main/java/no/nibio/vips/logic/controller/servlet/UserController.java
index 7eeab388..24034d1e 100755
--- a/src/main/java/no/nibio/vips/logic/controller/servlet/UserController.java
+++ b/src/main/java/no/nibio/vips/logic/controller/servlet/UserController.java
@@ -229,7 +229,9 @@ public class UserController extends HttpServlet {
FormValidation formValidation = FormValidator.validateForm("userForm",request,getServletContext());
FormField usernameField = formValidation.getFormField("username");
FormField passwordField = formValidation.getFormField("pass1");
- String username = usernameField.getWebValue().trim();
+ String username = (usernameField != null && usernameField.getWebValue() != null && !usernameField.getWebValue().trim().isEmpty()) ?
+ usernameField.getWebValue().trim()
+ : null;
String password = (passwordField != null && passwordField.getWebValue() != null && !passwordField.getWebValue().trim().isEmpty()) ?
passwordField.getWebValue().trim()
: null;
--
GitLab