nicko       2005/08/28 11:41:56

  Modified:    src/Layout XMLLayout.cs
  Log:
  Fix for Compact Framework. Changed to use 
Convert.ToBase64String(byte[],int,int)
  
  Revision  Changes    Path
  1.14      +6 -3      logging-log4net/src/Layout/XMLLayout.cs
  
  Index: XMLLayout.cs
  ===================================================================
  RCS file: /home/cvs/logging-log4net/src/Layout/XMLLayout.cs,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- XMLLayout.cs      25 Aug 2005 11:35:56 -0000      1.13
  +++ XMLLayout.cs      28 Aug 2005 18:41:55 -0000      1.14
  @@ -243,7 +243,9 @@
                        }

                        else

                        {

  -                             Transform.WriteEscapedXmlString(writer, 
Convert.ToBase64String(Encoding.UTF8.GetBytes(loggingEvent.RenderedMessage)),this.InvalidCharReplacement);

  +                             byte[] messageBytes = 
Encoding.UTF8.GetBytes(loggingEvent.RenderedMessage);

  +                             string base64Message = 
Convert.ToBase64String(messageBytes, 0, messageBytes.Length);

  +                             Transform.WriteEscapedXmlString(writer, 
base64Message,this.InvalidCharReplacement);

                        }

                        writer.WriteEndElement();

   

  @@ -262,11 +264,12 @@
                                        string valueStr =null;

                                        if (!this.Base64EncodeProperties)

                                        {

  -                                             
valueStr=Transform.MaskXmlInvalidCharacters(loggingEvent.Repository.RendererMap.FindAndRender(entry.Value),this.InvalidCharReplacement);

  +                                             valueStr = 
Transform.MaskXmlInvalidCharacters(loggingEvent.Repository.RendererMap.FindAndRender(entry.Value),this.InvalidCharReplacement);

                                        }

                                        else

                                        {

  -                                             
valueStr=Convert.ToBase64String(Encoding.UTF8.GetBytes(loggingEvent.Repository.RendererMap.FindAndRender(entry.Value)));

  +                                             byte[] propertyValueBytes = 
Encoding.UTF8.GetBytes(loggingEvent.Repository.RendererMap.FindAndRender(entry.Value));

  +                                             valueStr = 
Convert.ToBase64String(propertyValueBytes, 0, propertyValueBytes.Length);

                                        }

                                        writer.WriteAttributeString(ATTR_VALUE, 
valueStr);

   

  
  
  

Reply via email to