Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -r3afc4e7db10952dab59ea8ba53c6aac905455180 -r080d04eb033f76179ece18d8bd3ac466899f29e5
Binary files differ
Index: lams_common/src/java/org/lamsfoundation/lams/util/Configuration.java
===================================================================
diff -u -re136309c831c4509819e7651ce2f565747bccb57 -r080d04eb033f76179ece18d8bd3ac466899f29e5
--- lams_common/src/java/org/lamsfoundation/lams/util/Configuration.java	(.../Configuration.java)	(revision e136309c831c4509819e7651ce2f565747bccb57)
+++ lams_common/src/java/org/lamsfoundation/lams/util/Configuration.java	(.../Configuration.java)	(revision 080d04eb033f76179ece18d8bd3ac466899f29e5)
@@ -47,8 +47,9 @@
  */
 public class Configuration implements InitializingBean {
 
-	protected Logger log = Logger.getLogger(Configuration.class);	
 	
+	protected Logger log = Logger.getLogger(Configuration.class);	
+
 	private static Map items = null;
 
 	protected ConfigurationDAO configurationDAO;
@@ -60,28 +61,36 @@
 		this.configurationDAO = configurationDAO;
 	}
 	
+	/**
+	 * This class initialize method called by Spring framework.
+	 */
+	public void init(){
+
+	}
+	
 	public void afterPropertiesSet() {
+		if(items != null) {
+			return;
+		}
+		
 		Map itemsmap = Collections.synchronizedMap(new HashMap());
 		
 		try {
-			
 			List mapitems = configurationDAO.getAllItems();
-			
+				
 			if(mapitems.size() > 0) {
 				Iterator it = mapitems.iterator();
 				while(it.hasNext()) {
 					ConfigurationItem item = (ConfigurationItem) it.next();
 					itemsmap.put(item.getKey(), item.getValue());
-				}
-				
+				}	
 			}
+	
+			items = itemsmap;
 			
 		} catch (Exception e) {
 			 log.error("Exception has occurred: ",e);
 		}
-		
-		items = itemsmap;
-		
 	}
 	
 	public static String get(String key)