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

* Marking off which uses of catch (Exception e) is legit and which are not, for later removal/replacement.

ThreadPoolClientBranch
Adam Frisby 2008-02-06 15:30:02 +00:00
parent a37eb62047
commit f93fdfa5af
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
View File

@ -318,7 +318,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
{ {
File.Delete(OutFile); File.Delete(OutFile);
} }
catch (Exception e) catch (Exception e) // NOTLEGIT - Should be just catching FileIOException
{ {
//m_scriptEngine.Log.Error("[" + m_scriptEngine.ScriptEngineName + "]: Unable to delete old existring script-file before writing new. Compile aborted: " + e.ToString()); //m_scriptEngine.Log.Error("[" + m_scriptEngine.ScriptEngineName + "]: Unable to delete old existring script-file before writing new. Compile aborted: " + e.ToString());
throw new Exception("Unable to delete old existring script-file before writing new. Compile aborted: " + e.ToString()); throw new Exception("Unable to delete old existring script-file before writing new. Compile aborted: " + e.ToString());
@ -335,7 +335,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
Path.Combine("ScriptEngines", srcFileName), Path.Combine("ScriptEngines", srcFileName),
Script); Script);
} }
catch (Exception ex) catch (Exception ex) // NOTLEGIT - Should be just catching FileIOException
{ {
m_scriptEngine.Log.Error("[" + m_scriptEngine.ScriptEngineName + "]: Exception while trying to write script source to file \"" + srcFileName + "\": " + ex.ToString()); m_scriptEngine.Log.Error("[" + m_scriptEngine.ScriptEngineName + "]: Exception while trying to write script source to file \"" + srcFileName + "\": " + ex.ToString());
} }

6
OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
View File

@ -105,7 +105,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
// Fire the first start-event // Fire the first start-event
m_scriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "state_entry", EventQueueManager.llDetectNull, new object[] { }); m_scriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "state_entry", EventQueueManager.llDetectNull, new object[] { });
} }
catch (Exception e) catch (Exception e) // LEGIT: User Scripting
{ {
//m_scriptEngine.Log.Error("[ScriptEngine]: Error compiling script: " + e.ToString()); //m_scriptEngine.Log.Error("[ScriptEngine]: Error compiling script: " + e.ToString());
try try
@ -117,7 +117,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
World.SimChat(Helpers.StringToField(text), ChatTypeEnum.Say, 0, m_host.AbsolutePosition, World.SimChat(Helpers.StringToField(text), ChatTypeEnum.Say, 0, m_host.AbsolutePosition,
m_host.Name, m_host.UUID); m_host.Name, m_host.UUID);
} }
catch (Exception e2) catch (Exception e2) // LEGIT: User Scripting
{ {
m_scriptEngine.Log.Error("[" + m_scriptEngine.ScriptEngineName + "]: Error displaying error in-world: " + e2.ToString()); m_scriptEngine.Log.Error("[" + m_scriptEngine.ScriptEngineName + "]: Error displaying error in-world: " + e2.ToString());
m_scriptEngine.Log.Error("[" + m_scriptEngine.ScriptEngineName + "]: " + m_scriptEngine.Log.Error("[" + m_scriptEngine.ScriptEngineName + "]: " +
@ -154,7 +154,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
// Tell AppDomain that we have stopped script // Tell AppDomain that we have stopped script
m_scriptEngine.m_AppDomainManager.StopScript(ad); m_scriptEngine.m_AppDomainManager.StopScript(ad);
} }
catch (Exception e) catch (Exception e) // LEGIT: User Scripting
{ {
m_scriptEngine.Log.Error("[" + m_scriptEngine.ScriptEngineName + "]: Exception stopping script localID: " + localID + " LLUID: " + itemID.ToString() + m_scriptEngine.Log.Error("[" + m_scriptEngine.ScriptEngineName + "]: Exception stopping script localID: " + localID + " LLUID: " + itemID.ToString() +
": " + e.ToString()); ": " + e.ToString());

2
OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs
View File

@ -365,7 +365,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO
bytes[i] = br.ReadByte(); bytes[i] = br.ReadByte();
return bytes; return bytes;
} }
catch (Exception e) catch (Exception e) // NOTLEGIT: No user related exceptions throwable here?
{ {
Common.SendToDebug("Exception: " + e.ToString()); Common.SendToDebug("Exception: " + e.ToString());
throw (e); throw (e);

6
OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs
View File

@ -99,7 +99,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine
// Fire the first start-event // Fire the first start-event
m_scriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "state_entry", EventQueueManager.llDetectNull, new object[] { }); m_scriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "state_entry", EventQueueManager.llDetectNull, new object[] { });
} }
catch (Exception e) catch (Exception e) // LEGIT - User Script Compilation
{ {
//m_scriptEngine.Log.Error("[ScriptEngine]: Error compiling script: " + e.ToString()); //m_scriptEngine.Log.Error("[ScriptEngine]: Error compiling script: " + e.ToString());
try try
@ -111,7 +111,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine
World.SimChat(Helpers.StringToField(text), ChatTypeEnum.Say, 0, m_host.AbsolutePosition, World.SimChat(Helpers.StringToField(text), ChatTypeEnum.Say, 0, m_host.AbsolutePosition,
m_host.Name, m_host.UUID); m_host.Name, m_host.UUID);
} }
catch (Exception e2) catch (Exception e2) // LEGIT - User Scripting
{ {
m_scriptEngine.Log.Error("[ScriptEngine]: Error displaying error in-world: " + e2.ToString()); m_scriptEngine.Log.Error("[ScriptEngine]: Error displaying error in-world: " + e2.ToString());
m_scriptEngine.Log.Error("[ScriptEngine]: " + m_scriptEngine.Log.Error("[ScriptEngine]: " +
@ -146,7 +146,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine
// Tell AppDomain that we have stopped script // Tell AppDomain that we have stopped script
m_scriptEngine.m_AppDomainManager.StopScript(ad); m_scriptEngine.m_AppDomainManager.StopScript(ad);
} }
catch (Exception e) catch (Exception e) // LEGIT - Problems caused by User Scripting
{ {
Console.WriteLine("Exception stopping script localID: " + localID + " LLUID: " + itemID.ToString() + Console.WriteLine("Exception stopping script localID: " + localID + " LLUID: " + itemID.ToString() +
": " + e.ToString()); ": " + e.ToString());

6
OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
View File

@ -681,7 +681,7 @@ namespace OpenSim.Region.Terrain
} }
return true; return true;
} }
catch (Exception e) catch (Exception e) // SEMI-LEGIT: Catching problems caused by user input or scripts
{ {
resultText = "Error running terrain command: " + e.ToString(); resultText = "Error running terrain command: " + e.ToString();
return false; return false;
@ -1343,7 +1343,7 @@ namespace OpenSim.Region.Terrain
bmp.Save(filename, ImageFormat.Png); bmp.Save(filename, ImageFormat.Png);
} }
catch (Exception e) catch (Exception e) // LEGIT: Catching problems caused by OpenJPEG p/invoke
{ {
Console.WriteLine("Failed generating terrain map: " + e.ToString()); Console.WriteLine("Failed generating terrain map: " + e.ToString());
} }
@ -1362,7 +1362,7 @@ namespace OpenSim.Region.Terrain
imageData = OpenJPEG.EncodeFromImage(bmp, true); imageData = OpenJPEG.EncodeFromImage(bmp, true);
} }
catch (Exception e) catch (Exception e) // LEGIT: Catching problems caused by OpenJPEG p/invoke
{ {
Console.WriteLine("Failed generating terrain map: " + e.ToString()); Console.WriteLine("Failed generating terrain map: " + e.ToString());
} }