From dd94125d52ee24926dffee307a2b96540ff75234 Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Sun, 8 Sep 2013 19:00:57 +0200
Subject: [PATCH] remove unneeded synchronization locks on settings

---
 .../services/ApplicationSettingsService.java  | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/commafeed/backend/services/ApplicationSettingsService.java b/src/main/java/com/commafeed/backend/services/ApplicationSettingsService.java
index ce6aa506..bf49a053 100644
--- a/src/main/java/com/commafeed/backend/services/ApplicationSettingsService.java
+++ b/src/main/java/com/commafeed/backend/services/ApplicationSettingsService.java
@@ -3,7 +3,8 @@ package com.commafeed.backend.services;
 import java.util.Date;
 import java.util.Enumeration;
 
-import javax.ejb.Singleton;
+import javax.annotation.PostConstruct;
+import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
 
 import org.apache.commons.lang.time.DateUtils;
@@ -15,7 +16,7 @@ import com.commafeed.backend.dao.ApplicationSettingsDAO;
 import com.commafeed.backend.model.ApplicationSettings;
 import com.google.common.collect.Iterables;
 
-@Singleton
+@ApplicationScoped
 public class ApplicationSettingsService {
 
 	@Inject
@@ -23,19 +24,21 @@ public class ApplicationSettingsService {
 
 	private ApplicationSettings settings;
 
-	public void save(ApplicationSettings settings) {
-		this.settings = settings;
-		applicationSettingsDAO.saveOrUpdate(settings);
-		applyLogLevel();
+	@PostConstruct
+	private void init() {
+		settings = Iterables.getFirst(applicationSettingsDAO.findAll(), null);
 	}
 
 	public ApplicationSettings get() {
-		if (settings == null) {
-			settings = Iterables.getFirst(applicationSettingsDAO.findAll(), null);
-		}
 		return settings;
 	}
 
+	public void save(ApplicationSettings settings) {
+		applicationSettingsDAO.saveOrUpdate(settings);
+		this.settings = settings;
+		applyLogLevel();
+	}
+
 	public Date getUnreadThreshold() {
 		int keepStatusDays = get().getKeepStatusDays();
 		return keepStatusDays > 0 ? DateUtils.addDays(new Date(), -1 * keepStatusDays) : null;