From 7201037ac8c7ba771c31e5ab6bb5f1bf181a55b8 Mon Sep 17 00:00:00 2001
From: Jaime Melis <j.melis@fdi.ucm.es>
Date: Thu, 24 Feb 2011 12:36:55 +0100
Subject: [PATCH] Feature #495: Fixed bug defining twice the ONE_LOCATION
 global variable in the sinatra server

---
 src/sunstone/models/OpenNebulaJSON.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sunstone/models/OpenNebulaJSON.rb b/src/sunstone/models/OpenNebulaJSON.rb
index 51e2478221..709f553a48 100644
--- a/src/sunstone/models/OpenNebulaJSON.rb
+++ b/src/sunstone/models/OpenNebulaJSON.rb
@@ -14,7 +14,7 @@
 # limitations under the License.                                             #
 #--------------------------------------------------------------------------- #
 
-ONE_LOCATION = ENV["ONE_LOCATION"]
+ONE_LOCATION = ENV["ONE_LOCATION"] if !ONE_LOCATION
 
 if !ONE_LOCATION
     RUBY_LIB_LOCATION = "/usr/lib/one/ruby"