Minor fixes

src/main/java/org/nrg/xapi/rest/settings/SiteConfigApi.java

@@ -45,7 +45,10 @@ public class SiteConfigApi extends AbstractXapiRestController {
     @PostConstruct
     public void checkForFoundPreferences() {
         if (!_appInfo.isInitialized()) {
-            _found.putAll(_appInfo.getFoundPreferences());
+            Map<String, String> tempPrefs = _appInfo.getFoundPreferences();
+            if(tempPrefs!=null){
+                _found.putAll(tempPrefs);
+            }
             if (_found.size() > 0) {
                 _hasFoundPreferences = true;
             }

src/main/java/org/nrg/xnat/configuration/ApplicationConfig.java

@@ -62,8 +62,8 @@ public class ApplicationConfig {
     }
 
     @Bean
-    public AutomationPreferences automationPreferences(final NrgEventService service) {
-        return new AutomationPreferences(service);
+    public AutomationPreferences automationPreferences(final NrgPreferenceService preferenceService, final NrgEventService service) {
+        return new AutomationPreferences(preferenceService, service);
     }
 
     @Bean

src/main/java/org/nrg/xnat/preferences/AutomationPreferences.java

@@ -4,6 +4,7 @@ import org.nrg.framework.services.NrgEventService;
 import org.nrg.prefs.annotations.NrgPreference;
 import org.nrg.prefs.annotations.NrgPreferenceBean;
 import org.nrg.prefs.exceptions.InvalidPreferenceName;
+import org.nrg.prefs.services.NrgPreferenceService;
 import org.nrg.xdat.preferences.EventTriggeringAbstractPreferenceBean;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -18,8 +19,8 @@ public class AutomationPreferences extends EventTriggeringAbstractPreferenceBean
     public static final String AUTOMATION_TOOL_ID = "automation";
 
     @Autowired
-    public AutomationPreferences(final NrgEventService eventService) {
-        super(eventService);
+    public AutomationPreferences(final NrgPreferenceService preferenceService, final NrgEventService eventService) {
+        super(preferenceService, eventService);
     }
 
     @NrgPreference(defaultValue = "true")

src/main/java/org/nrg/xnat/turbine/modules/actions/AcceptProjectAccess.java

@@ -29,6 +29,7 @@ public class AcceptProjectAccess extends SecureAction {
 	@Override
 	public void doPerform(RunData data, Context context) throws Exception {
 		UserI user = (UserI) context.get("user"); //Check the user in the context before XDAT.getUserDetails() because XDAT.getUserDetails() may still be the guest user at this point.
+
 		if (user == null) {
 			user = XDAT.getUserDetails();
         }