From 1fa2df99cca2f9ec25c571ee0fef8509001f6436 Mon Sep 17 00:00:00 2001
From: Kelven Yang <kelven@cloud.com>
Date: Thu, 18 Nov 2010 14:42:35 -0800
Subject: [PATCH] Merge a fix in 2.1.x branch back to master

---
 .../dao/ConfigurationDaoImpl.java             | 52 +++++++++++--------
 1 file changed, 31 insertions(+), 21 deletions(-)

diff --git a/core/src/com/cloud/configuration/dao/ConfigurationDaoImpl.java b/core/src/com/cloud/configuration/dao/ConfigurationDaoImpl.java
index 507717ad77a..1c6e7dede3b 100644
--- a/core/src/com/cloud/configuration/dao/ConfigurationDaoImpl.java
+++ b/core/src/com/cloud/configuration/dao/ConfigurationDaoImpl.java
@@ -156,27 +156,37 @@ public class ConfigurationDaoImpl extends GenericDaoBase<ConfigurationVO, String
     	PreparedStatement stmt = null;
     	PreparedStatement stmtInsert = null;
     	String returnValue = initValue;
-    	try {
-    		txn.start();
-    		stmt = txn.prepareAutoCloseStatement("SELECT value FROM configuration WHERE name=?");
-    		stmt.setString(1, name);
-    		ResultSet rs = stmt.executeQuery();
-    		if(rs != null && rs.next()) {
-    			returnValue =  rs.getString(1);
-    		} else {
-    			stmtInsert = txn.prepareAutoCloseStatement("INSERT INTO configuration(instance, name, value, description) VALUES('DEFAULT', ?, ?, '')");
-    			stmtInsert.setString(1, name);
-    			stmtInsert.setString(2, initValue);
-    			if(stmtInsert.executeUpdate() < 1) {
-    				throw new CloudRuntimeException("Unable to init configuration variable: " + name); 
-    			}
-    		}
-    		txn.commit();
-    		return returnValue;
-    	} catch (Exception e) {
-    		s_logger.warn("Unable to update Configuration Value", e);
-    		throw new CloudRuntimeException("Unable to init configuration variable: " + name); 
-    	}
+		try {
+			txn.start();
+			stmt = txn.prepareAutoCloseStatement("SELECT value FROM configuration WHERE name=?");
+			stmt.setString(1, name);
+			ResultSet rs = stmt.executeQuery();
+			if(rs != null && rs.next()) {
+				returnValue =  rs.getString(1);
+				if(returnValue != null) {
+					txn.commit();
+					return returnValue;
+				} else {
+					// restore init value
+					returnValue = initValue;
+				}
+			}
+			stmt.close();
+			
+			stmtInsert = txn.prepareAutoCloseStatement(
+				"INSERT INTO configuration(instance, name, value, description) VALUES('DEFAULT', ?, ?, '') ON DUPLICATE KEY UPDATE value=?");
+			stmtInsert.setString(1, name);
+			stmtInsert.setString(2, initValue);
+			stmtInsert.setString(3, initValue);
+			if(stmtInsert.executeUpdate() < 1) {
+				throw new CloudRuntimeException("Unable to init configuration variable: " + name); 
+			}
+			txn.commit();
+			return returnValue;
+		} catch (Exception e) {
+			s_logger.warn("Unable to update Configuration Value", e);
+			throw new CloudRuntimeException("Unable to init configuration variable: " + name); 
+		}
     }
     
     @Override