Merge pull request #65 from uPortal-Project/fix_NPE_VFS_Auth

Fix: NPE when no userAuthenticatorService set
uPortal-Project · Jul 23, 2021 · 1122898 · 1122898
2 parents e70ef01 + 316362a
commit 1122898
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/org/esupportail/portlet/filemanager/services/FsAccess.java b/src/main/java/org/esupportail/portlet/filemanager/services/FsAccess.java
@@ -177,8 +177,8 @@ public boolean supportIntraCutPast() {
 	}
 
 	public boolean formAuthenticationRequired(SharedUserPortletParameters userParameters) {
-		if(this.userAuthenticatorService.formAuthenticationNeeded(userParameters)) {
-			if(this.userAuthenticatorService.getUserPassword(userParameters) == null || this.userAuthenticatorService.getUserPassword(userParameters).getPassword() == null || this.userAuthenticatorService.getUserPassword(userParameters).getPassword().length() == 0) {
+		if (this.userAuthenticatorService != null && this.userAuthenticatorService.formAuthenticationNeeded(userParameters)) {
+			if (this.userAuthenticatorService.getUserPassword(userParameters) == null || this.userAuthenticatorService.getUserPassword(userParameters).getPassword() == null || this.userAuthenticatorService.getUserPassword(userParameters).getPassword().length() == 0) {
 				this.userAuthenticatorService.initialize(userParameters);
 				return true;
 			}