From fbe265fa787e4be9cb63c6bae2ef30b9400d9afc Mon Sep 17 00:00:00 2001
From: Simon Harrer <simon.harrer@gmail.com>
Date: Thu, 18 Jul 2013 10:11:04 -0400
Subject: [PATCH] Fixes findbugs warning - dereferencing null in exception case
---
src/main/java/com/gitblit/GitblitUserService.java | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/gitblit/GitblitUserService.java b/src/main/java/com/gitblit/GitblitUserService.java
index fe35db9..658404b 100644
--- a/src/main/java/com/gitblit/GitblitUserService.java
+++ b/src/main/java/com/gitblit/GitblitUserService.java
@@ -52,8 +52,6 @@
protected IUserService serviceImpl;
- protected final String ExternalAccount = "#externalAccount";
-
private final Logger logger = LoggerFactory.getLogger(GitblitUserService.class);
public GitblitUserService() {
@@ -324,7 +322,7 @@
protected void setAccountType(UserModel user) {
if (user != null) {
if (!StringUtils.isEmpty(user.password)
- && !ExternalAccount.equalsIgnoreCase(user.password)
+ && !Constants.EXTERNAL_ACCOUNT.equalsIgnoreCase(user.password)
&& !"StoredInLDAP".equalsIgnoreCase(user.password)) {
user.accountType = AccountType.LOCAL;
} else {
--
Gitblit v1.9.1