[Dotgnu-pnet-commits] CVS: pnetlib/runtime/System/Text Encoding.cs,1.12,1.13

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnetlib/runtime/System/Text
In directory subversions:/tmp/cvs-serv14939/runtime/System/Text

Modified Files:
        Encoding.cs 
Log Message:


Make "InvokeI18N" more robust against errors when loading "I18N".


Index: Encoding.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/Text/Encoding.cs,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** Encoding.cs 28 Nov 2002 06:22:43 -0000      1.12
--- Encoding.cs 21 Dec 2002 01:32:44 -0000      1.13
***************
*** 23,26 ****
--- 23,27 ----
  
  using System;
+ using System.IO;
  using System.Reflection;
  using System.Globalization;
***************
*** 259,262 ****
--- 260,281 ----
                                                        {
                                                                // Assembly 
loading unsupported by the engine.
+                                                               i18nDisabled = 
true;
+                                                               return null;
+                                                       }
+                                                       
catch(FileNotFoundException)
+                                                       {
+                                                               // Could not 
locate the I18N assembly.
+                                                               i18nDisabled = 
true;
+                                                               return null;
+                                                       }
+                                                       
catch(BadImageFormatException)
+                                                       {
+                                                               // Something 
was wrong with the I18N assembly.
+                                                               i18nDisabled = 
true;
+                                                               return null;
+                                                       }
+                                                       catch(SecurityException)
+                                                       {
+                                                               // The engine 
refused to load I18N.
                                                                i18nDisabled = 
true;
                                                                return null;