From 623cab5a93c5d03b90a17f458e6c995122e70a7e Mon Sep 17 00:00:00 2001
From: Mike McKay <mfmckay@wustl.edu>
Date: Wed, 7 Sep 2016 16:33:15 -0500
Subject: [PATCH] Added null check to XnatAppInfo.
---
.../org/nrg/xnat/services/XnatAppInfo.java | 25 +++++++++++--------
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/nrg/xnat/services/XnatAppInfo.java b/src/main/java/org/nrg/xnat/services/XnatAppInfo.java
index cf329021..f0ad26b6 100644
--- a/src/main/java/org/nrg/xnat/services/XnatAppInfo.java
+++ b/src/main/java/org/nrg/xnat/services/XnatAppInfo.java
@@ -169,16 +169,21 @@ public class XnatAppInfo {
_log.info("The site was not flagged as initialized and initialized preference set to false. Setting system for initialization.");
}
for (String pref : _foundPreferences.keySet()) {
- _template.update(
- "UPDATE xhbm_preference SET value = ? WHERE name = ?",
- new Object[]{_foundPreferences.get(pref), pref}, new int[]{Types.VARCHAR, Types.VARCHAR}
- );
- try {
- XDAT.getSiteConfigPreferences().set(_foundPreferences.get(pref), pref);
- } catch (InvalidPreferenceName e) {
- _log.error("", e);
- } catch (NullPointerException e) {
- _log.error("Error getting site config preferences.", e);
+ if(_foundPreferences.get(pref)!=null) {
+ _template.update(
+ "UPDATE xhbm_preference SET value = ? WHERE name = ?",
+ new Object[]{_foundPreferences.get(pref), pref}, new int[]{Types.VARCHAR, Types.VARCHAR}
+ );
+ try {
+ XDAT.getSiteConfigPreferences().set(_foundPreferences.get(pref), pref);
+ } catch (InvalidPreferenceName e) {
+ _log.error("", e);
+ } catch (NullPointerException e) {
+ _log.error("Error getting site config preferences.", e);
+ }
+ }
+ else{
+ _log.warn("Preference "+pref+" was null.");
}
}
}
--
GitLab