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/SalesforceUserService.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/gitblit/SalesforceUserService.java b/src/main/java/com/gitblit/SalesforceUserService.java
index 4a6a1ba..aa0795a 100644
--- a/src/main/java/com/gitblit/SalesforceUserService.java
+++ b/src/main/java/com/gitblit/SalesforceUserService.java
@@ -5,6 +5,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.gitblit.Constants.AccountType;
import com.gitblit.models.UserModel;
import com.gitblit.utils.ArrayUtils;
import com.gitblit.utils.StringUtils;
@@ -18,7 +19,11 @@
public static final Logger logger = LoggerFactory
.getLogger(SalesforceUserService.class);
private IStoredSettings settings;
-
+
+ protected AccountType getAccountType() {
+ return AccountType.SALESFORCE;
+ }
+
@Override
public void setup(IStoredSettings settings) {
this.settings = settings;
@@ -96,7 +101,7 @@
private void setUserAttributes(UserModel user, GetUserInfoResult info) {
// Don't want visibility into the real password, make up a dummy
- user.password = ExternalAccount;
+ user.password = Constants.EXTERNAL_ACCOUNT;
user.accountType = getAccountType();
// Get full name Attribute
--
Gitblit v1.9.1