aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorAdam Frisby2008-02-06 15:30:02 +0000
committerAdam Frisby2008-02-06 15:30:02 +0000
commitf93fdfa5af0a8dd39f471a97a55209451f7ca7a0 (patch)
tree210ba9757b0759232b4896febc482a9c5675e953
parent* Added debug message to try track down Mantis#305. (diff)
downloadopensim-SC_OLD-f93fdfa5af0a8dd39f471a97a55209451f7ca7a0.zip
opensim-SC_OLD-f93fdfa5af0a8dd39f471a97a55209451f7ca7a0.tar.gz
opensim-SC_OLD-f93fdfa5af0a8dd39f471a97a55209451f7ca7a0.tar.bz2
opensim-SC_OLD-f93fdfa5af0a8dd39f471a97a55209451f7ca7a0.tar.xz
* Marking off which uses of catch (Exception e) is legit and which are not, for later removal/replacement.
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs6
-rw-r--r--OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs6
-rw-r--r--OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs6
5 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
index 2f985e4..10959c5 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
@@ -318,7 +318,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
318 { 318 {
319 File.Delete(OutFile); 319 File.Delete(OutFile);
320 } 320 }
321 catch (Exception e) 321 catch (Exception e) // NOTLEGIT - Should be just catching FileIOException
322 { 322 {
323 //m_scriptEngine.Log.Error("[" + m_scriptEngine.ScriptEngineName + "]: Unable to delete old existring script-file before writing new. Compile aborted: " + e.ToString()); 323 //m_scriptEngine.Log.Error("[" + m_scriptEngine.ScriptEngineName + "]: Unable to delete old existring script-file before writing new. Compile aborted: " + e.ToString());
324 throw new Exception("Unable to delete old existring script-file before writing new. Compile aborted: " + e.ToString()); 324 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
335 Path.Combine("ScriptEngines", srcFileName), 335 Path.Combine("ScriptEngines", srcFileName),
336 Script); 336 Script);
337 } 337 }
338 catch (Exception ex) 338 catch (Exception ex) // NOTLEGIT - Should be just catching FileIOException
339 { 339 {
340 m_scriptEngine.Log.Error("[" + m_scriptEngine.ScriptEngineName + "]: Exception while trying to write script source to file \"" + srcFileName + "\": " + ex.ToString()); 340 m_scriptEngine.Log.Error("[" + m_scriptEngine.ScriptEngineName + "]: Exception while trying to write script source to file \"" + srcFileName + "\": " + ex.ToString());
341 } 341 }
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
index c39d376..b407f8d 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
@@ -105,7 +105,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
105 // Fire the first start-event 105 // Fire the first start-event
106 m_scriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "state_entry", EventQueueManager.llDetectNull, new object[] { }); 106 m_scriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "state_entry", EventQueueManager.llDetectNull, new object[] { });
107 } 107 }
108 catch (Exception e) 108 catch (Exception e) // LEGIT: User Scripting
109 { 109 {
110 //m_scriptEngine.Log.Error("[ScriptEngine]: Error compiling script: " + e.ToString()); 110 //m_scriptEngine.Log.Error("[ScriptEngine]: Error compiling script: " + e.ToString());
111 try 111 try
@@ -117,7 +117,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
117 World.SimChat(Helpers.StringToField(text), ChatTypeEnum.Say, 0, m_host.AbsolutePosition, 117 World.SimChat(Helpers.StringToField(text), ChatTypeEnum.Say, 0, m_host.AbsolutePosition,
118 m_host.Name, m_host.UUID); 118 m_host.Name, m_host.UUID);
119 } 119 }
120 catch (Exception e2) 120 catch (Exception e2) // LEGIT: User Scripting
121 { 121 {
122 m_scriptEngine.Log.Error("[" + m_scriptEngine.ScriptEngineName + "]: Error displaying error in-world: " + e2.ToString()); 122 m_scriptEngine.Log.Error("[" + m_scriptEngine.ScriptEngineName + "]: Error displaying error in-world: " + e2.ToString());
123 m_scriptEngine.Log.Error("[" + m_scriptEngine.ScriptEngineName + "]: " + 123 m_scriptEngine.Log.Error("[" + m_scriptEngine.ScriptEngineName + "]: " +
@@ -154,7 +154,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
154 // Tell AppDomain that we have stopped script 154 // Tell AppDomain that we have stopped script
155 m_scriptEngine.m_AppDomainManager.StopScript(ad); 155 m_scriptEngine.m_AppDomainManager.StopScript(ad);
156 } 156 }
157 catch (Exception e) 157 catch (Exception e) // LEGIT: User Scripting
158 { 158 {
159 m_scriptEngine.Log.Error("[" + m_scriptEngine.ScriptEngineName + "]: Exception stopping script localID: " + localID + " LLUID: " + itemID.ToString() + 159 m_scriptEngine.Log.Error("[" + m_scriptEngine.ScriptEngineName + "]: Exception stopping script localID: " + localID + " LLUID: " + itemID.ToString() +
160 ": " + e.ToString()); 160 ": " + e.ToString());
diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs
index efe8648..e1fff5c 100644
--- a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs
+++ b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs
@@ -365,7 +365,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO
365 bytes[i] = br.ReadByte(); 365 bytes[i] = br.ReadByte();
366 return bytes; 366 return bytes;
367 } 367 }
368 catch (Exception e) 368 catch (Exception e) // NOTLEGIT: No user related exceptions throwable here?
369 { 369 {
370 Common.SendToDebug("Exception: " + e.ToString()); 370 Common.SendToDebug("Exception: " + e.ToString());
371 throw (e); 371 throw (e);
diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs
index db81487..f10a11f 100644
--- a/OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs
@@ -99,7 +99,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine
99 // Fire the first start-event 99 // Fire the first start-event
100 m_scriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "state_entry", EventQueueManager.llDetectNull, new object[] { }); 100 m_scriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "state_entry", EventQueueManager.llDetectNull, new object[] { });
101 } 101 }
102 catch (Exception e) 102 catch (Exception e) // LEGIT - User Script Compilation
103 { 103 {
104 //m_scriptEngine.Log.Error("[ScriptEngine]: Error compiling script: " + e.ToString()); 104 //m_scriptEngine.Log.Error("[ScriptEngine]: Error compiling script: " + e.ToString());
105 try 105 try
@@ -111,7 +111,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine
111 World.SimChat(Helpers.StringToField(text), ChatTypeEnum.Say, 0, m_host.AbsolutePosition, 111 World.SimChat(Helpers.StringToField(text), ChatTypeEnum.Say, 0, m_host.AbsolutePosition,
112 m_host.Name, m_host.UUID); 112 m_host.Name, m_host.UUID);
113 } 113 }
114 catch (Exception e2) 114 catch (Exception e2) // LEGIT - User Scripting
115 { 115 {
116 m_scriptEngine.Log.Error("[ScriptEngine]: Error displaying error in-world: " + e2.ToString()); 116 m_scriptEngine.Log.Error("[ScriptEngine]: Error displaying error in-world: " + e2.ToString());
117 m_scriptEngine.Log.Error("[ScriptEngine]: " + 117 m_scriptEngine.Log.Error("[ScriptEngine]: " +
@@ -146,7 +146,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine
146 // Tell AppDomain that we have stopped script 146 // Tell AppDomain that we have stopped script
147 m_scriptEngine.m_AppDomainManager.StopScript(ad); 147 m_scriptEngine.m_AppDomainManager.StopScript(ad);
148 } 148 }
149 catch (Exception e) 149 catch (Exception e) // LEGIT - Problems caused by User Scripting
150 { 150 {
151 Console.WriteLine("Exception stopping script localID: " + localID + " LLUID: " + itemID.ToString() + 151 Console.WriteLine("Exception stopping script localID: " + localID + " LLUID: " + itemID.ToString() +
152 ": " + e.ToString()); 152 ": " + e.ToString());
diff --git a/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs b/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
index f722f12..248549e 100644
--- a/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
@@ -681,7 +681,7 @@ namespace OpenSim.Region.Terrain
681 } 681 }
682 return true; 682 return true;
683 } 683 }
684 catch (Exception e) 684 catch (Exception e) // SEMI-LEGIT: Catching problems caused by user input or scripts
685 { 685 {
686 resultText = "Error running terrain command: " + e.ToString(); 686 resultText = "Error running terrain command: " + e.ToString();
687 return false; 687 return false;
@@ -1343,7 +1343,7 @@ namespace OpenSim.Region.Terrain
1343 1343
1344 bmp.Save(filename, ImageFormat.Png); 1344 bmp.Save(filename, ImageFormat.Png);
1345 } 1345 }
1346 catch (Exception e) 1346 catch (Exception e) // LEGIT: Catching problems caused by OpenJPEG p/invoke
1347 { 1347 {
1348 Console.WriteLine("Failed generating terrain map: " + e.ToString()); 1348 Console.WriteLine("Failed generating terrain map: " + e.ToString());
1349 } 1349 }
@@ -1362,7 +1362,7 @@ namespace OpenSim.Region.Terrain
1362 1362
1363 imageData = OpenJPEG.EncodeFromImage(bmp, true); 1363 imageData = OpenJPEG.EncodeFromImage(bmp, true);
1364 } 1364 }
1365 catch (Exception e) 1365 catch (Exception e) // LEGIT: Catching problems caused by OpenJPEG p/invoke
1366 { 1366 {
1367 Console.WriteLine("Failed generating terrain map: " + e.ToString()); 1367 Console.WriteLine("Failed generating terrain map: " + e.ToString());
1368 } 1368 }