[dotgnu-pnet-commits] pnetlib ChangeLog System.Xml/Serialization/XmlS...

[Heiko Weiss]

CVSROOT:        /sources/dotgnu-pnet
Module name:    pnetlib
Changes by:     Heiko Weiss <brubbel>   06/10/31 18:12:20

Modified files:
        .              : ChangeLog 
        System.Xml/Serialization: XmlSerializer.cs 
        System/CodeDom/Compiler: CodeCompiler.cs 

Log message:
        XmlSerializer.cs: fixed serialization errors.
        CodeCompiler.cs: fixed catching compiler errors.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pnetlib/ChangeLog?cvsroot=dotgnu-pnet&r1=1.2453&r2=1.2454
http://cvs.savannah.gnu.org/viewcvs/pnetlib/System.Xml/Serialization/XmlSerializer.cs?cvsroot=dotgnu-pnet&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/pnetlib/System/CodeDom/Compiler/CodeCompiler.cs?cvsroot=dotgnu-pnet&r1=1.9&r2=1.10

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/dotgnu-pnet/pnetlib/ChangeLog,v
retrieving revision 1.2453
retrieving revision 1.2454
diff -u -b -r1.2453 -r1.2454
--- ChangeLog   30 Oct 2006 21:56:22 -0000      1.2453
+++ ChangeLog   31 Oct 2006 18:12:19 -0000      1.2454
@@ -1,3 +1,8 @@
+2006-10-31  Heiko Weiss <address@hidden>
+
+       * System.Xml/Serialization/XmlSerializer.cs: fixed serialization errors.
+       * System/CodeDom/Compiler/CodeCompiler.cs: fixed catching compiler 
errors.
+
 2006-10-26  Russell Stuart  <address@hidden>
 
        * Array.cs: IndexOf, LastIndexOf & Sort() not checking bounds properly.

Index: System.Xml/Serialization/XmlSerializer.cs
===================================================================
RCS file: 
/sources/dotgnu-pnet/pnetlib/System.Xml/Serialization/XmlSerializer.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- System.Xml/Serialization/XmlSerializer.cs   5 Oct 2004 05:40:07 -0000       
1.4
+++ System.Xml/Serialization/XmlSerializer.cs   31 Oct 2006 18:12:20 -0000      
1.5
@@ -438,12 +438,28 @@
                                }
                        }
                        
+                       /*
+                       Brubbel:
+                       we have problems using the generator.
+                       if we do not generate it no problems where there any 
more.
+                       The problems are that the compiled generator does not 
work or 
+                       the compiler returns an error.
+                       Since we do not generate any more, we never had 
problems with 
+                       serialization and deserialization of objects.
+                        
+                       Since we have libjit the generator is no longer needed.
+                       
+                       Please be careful if U want to enable this.
+                       */
+                       
+#if USE_GENERATOR
                        bool generate = false;
                        lock (serializerData)
                        {
                                generate = (++serializerData.UsageCount == 
generationThreshold);
                        }
                        
+                       
                        if (generate)
                        {
                                if (serializerData.Batch != null)
@@ -456,6 +472,7 @@
                                        GenerateSerializers (batch);
                                }
                        }
+#endif
                }
                
                void GenerateSerializers (GenerationBatch batch)

Index: System/CodeDom/Compiler/CodeCompiler.cs
===================================================================
RCS file: /sources/dotgnu-pnet/pnetlib/System/CodeDom/Compiler/CodeCompiler.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- System/CodeDom/Compiler/CodeCompiler.cs     15 Sep 2004 15:21:27 -0000      
1.9
+++ System/CodeDom/Compiler/CodeCompiler.cs     31 Oct 2006 18:12:20 -0000      
1.10
@@ -368,6 +368,7 @@
                                        {
                                                ++posn;
                                        }
+                                       try {
                                        error.Line = Int32.Parse
                                                (line.Substring(start, posn - 
start));
                                        if(posn < line.Length && line[posn + 1] 
!= ' ')
@@ -386,6 +387,15 @@
                                                ++posn;
                                        }
                                }
+                                       catch {
+                                               // compiler output could be 
XXXX: no such library.
+                                               // so Int32.Parse(XXXX: no such 
library) would throw an exception
+                                               error.Line = 0;
+                                               error.Column = 0;
+                                               error.ErrorText = line;
+                                               return error;
+                                       }
+                               }
 
                                // Skip white space.
                                while(posn < line.Length && line[posn] == ' ')