OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix a recent regression in e17392a where JsonSetValue() stopped working (probably other functions as well). 

Fix is to call through to the no-arg constructor from the string constructor in JsonStore, which I suspect was just forgotten.
This was actually picked up by the TestJsonSetValue() regression test failing
But this isn't being run on jenkins due to the .net version issue.
This commit also puts the full stack trace in logged messages and makes these error level messages instead of info
user_profiles
Justin Clark-Casey (justincc) 2013-02-07 23:08:19 +00:00
parent e17392acbb
commit c135c3224f
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStore.cs
View File

@ -114,7 +114,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
m_ReadStore = new List<TakeValueCallbackClass>(); m_ReadStore = new List<TakeValueCallbackClass>();
} }
public JsonStore(string value) public JsonStore(string value) : this()
{ {
if (String.IsNullOrEmpty(value)) if (String.IsNullOrEmpty(value))
ValueStore = new OSDMap(); ValueStore = new OSDMap();

20
OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs
View File

@ -93,12 +93,12 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
} }
catch (Exception e) catch (Exception e)
{ {
m_log.ErrorFormat("[JsonStore] initialization error: {0}",e.Message); m_log.Error("[JsonStore]: initialization error: {0}", e);
return; return;
} }
if (m_enabled) if (m_enabled)
m_log.DebugFormat("[JsonStore] module is enabled"); m_log.DebugFormat("[JsonStore]: module is enabled");
} }
// ----------------------------------------------------------------- // -----------------------------------------------------------------
@ -182,7 +182,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
SceneObjectPart sop = m_scene.GetSceneObjectPart(objectID); SceneObjectPart sop = m_scene.GetSceneObjectPart(objectID);
if (sop == null) if (sop == null)
{ {
m_log.InfoFormat("[JsonStore] unable to attach to unknown object; {0}",objectID); m_log.ErrorFormat("[JsonStore] unable to attach to unknown object; {0}", objectID);
return false; return false;
} }
@ -219,7 +219,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
} }
catch (Exception e) catch (Exception e)
{ {
m_log.InfoFormat("[JsonStore] Unable to initialize store from {0}; {1}",value,e.Message); m_log.Error(string.Format("[JsonStore]: Unable to initialize store from {0}", value), e);
return false; return false;
} }
@ -283,7 +283,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
} }
catch (Exception e) catch (Exception e)
{ {
m_log.InfoFormat("[JsonStore] Path test failed for {0} in {1}; {2}",path,storeID,e.Message); m_log.Error(string.Format("[JsonStore]: Path test failed for {0} in {1}", path, storeID), e);
} }
return false; return false;
@ -316,7 +316,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
} }
catch (Exception e) catch (Exception e)
{ {
m_log.InfoFormat("[JsonStore] Unable to assign {0} to {1} in {2}; {3}",value,path,storeID,e.Message); m_log.Error(string.Format("[JsonStore]: Unable to assign {0} to {1} in {2}", value, path, storeID), e);
} }
return false; return false;
@ -349,7 +349,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
} }
catch (Exception e) catch (Exception e)
{ {
m_log.InfoFormat("[JsonStore] Unable to remove {0} in {1}; {2}",path,storeID,e.Message); m_log.Error(string.Format("[JsonStore]: Unable to remove {0} in {1}", path, storeID), e);
} }
return false; return false;
@ -382,7 +382,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
} }
catch (Exception e) catch (Exception e)
{ {
m_log.InfoFormat("[JsonStore] unable to retrieve value; {0}",e.Message); m_log.Error("[JsonStore]: unable to retrieve value", e);
} }
return false; return false;
@ -421,7 +421,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
} }
catch (Exception e) catch (Exception e)
{ {
m_log.InfoFormat("[JsonStore] unable to retrieve value; {0}",e.ToString()); m_log.Error("[JsonStore] unable to retrieve value", e);
} }
cback(String.Empty); cback(String.Empty);
@ -460,7 +460,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
} }
catch (Exception e) catch (Exception e)
{ {
m_log.InfoFormat("[JsonStore] unable to retrieve value; {0}",e.ToString()); m_log.Error("[JsonStore]: unable to retrieve value", e);
} }
cback(String.Empty); cback(String.Empty);

6
OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs
View File

@ -186,11 +186,11 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{ }"); UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{ }");
int result = (int)InvokeOp("JsonSetValue", storeId, "Hello", "World"); int result = (int)InvokeOp("JsonSetValue", storeId, "Fun", "Times");
Assert.That(result, Is.EqualTo(1)); Assert.That(result, Is.EqualTo(1));
string value = (string)InvokeOp("JsonGetValue", storeId, "Hello"); string value = (string)InvokeOp("JsonGetValue", storeId, "Fun");
Assert.That(value, Is.EqualTo("World")); Assert.That(value, Is.EqualTo("Times"));
} }
public object DummyTestMethod(object o1, object o2, object o3, object o4, object o5) { return null; } public object DummyTestMethod(object o1, object o2, object o3, object o4, object o5) { return null; }