From aef82fe6906d3cd5c51b199c9500ae975e294721 Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Tue, 30 Apr 2013 07:11:57 +0200
Subject: [PATCH] store a copy of the settings in memory

---
 .../services/ApplicationSettingsService.java        | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/commafeed/backend/services/ApplicationSettingsService.java b/src/main/java/com/commafeed/backend/services/ApplicationSettingsService.java
index cb1be5ba..6921e711 100644
--- a/src/main/java/com/commafeed/backend/services/ApplicationSettingsService.java
+++ b/src/main/java/com/commafeed/backend/services/ApplicationSettingsService.java
@@ -1,24 +1,31 @@
 package com.commafeed.backend.services;
 
-import javax.ejb.Stateless;
+import javax.ejb.Singleton;
 import javax.inject.Inject;
 
 import com.commafeed.backend.dao.ApplicationSettingsDAO;
 import com.commafeed.backend.model.ApplicationSettings;
 import com.google.common.collect.Iterables;
 
-@Stateless
+@Singleton
 public class ApplicationSettingsService {
 
 	@Inject
 	ApplicationSettingsDAO applicationSettingsDAO;
 
+	private ApplicationSettings settings;
+
 	public void save(ApplicationSettings settings) {
+		this.settings = settings;
 		applicationSettingsDAO.saveOrUpdate(settings);
 	}
 
 	public ApplicationSettings get() {
-		return Iterables.getFirst(applicationSettingsDAO.findAll(), null);
+		if (settings == null) {
+			settings = Iterables.getFirst(applicationSettingsDAO.findAll(),
+					null);
+		}
+		return settings;
 	}
 
 }