cvs commit: logging-log4net/src/Layout PatternLayout.cs

[nicko]

nicko       2004/09/13 00:52:07

  Modified:    src/Layout PatternLayout.cs
  Log:
  Added comments and null arg checks
  
  Revision  Changes    Path
  1.12      +9 -2      logging-log4net/src/Layout/PatternLayout.cs
  
  Index: PatternLayout.cs
  ===================================================================
  RCS file: /home/cvs/logging-log4net/src/Layout/PatternLayout.cs,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- PatternLayout.cs  10 Sep 2004 19:40:23 -0000      1.11
  +++ PatternLayout.cs  13 Sep 2004 07:52:07 -0000      1.12
  @@ -680,6 +680,9 @@
                /// </summary>
                private PatternConverter m_head;
   
  +             /// <summary>
  +             /// patterns defined on this PatternLayout only
  +             /// </summary>
                private Hashtable m_instanceRulesRegistry = new Hashtable();
   
                #endregion
  @@ -800,13 +803,12 @@
                        IgnoresException = true;
   
                        m_pattern = pattern;
  -
                        if (m_pattern == null)
                        {
                                m_pattern = DefaultConversionPattern;
                        }
   
  -                     m_head = CreatePatternParser(pattern).Parse();
  +                     ActivateOptions();
                }
   
                #endregion
  @@ -838,6 +840,7 @@
                        {
                                patternParser.PatternConverters[entry.Key] = 
entry.Value;
                        }
  +                     // Add the instance patterns
                        foreach(DictionaryEntry entry in 
m_instanceRulesRegistry)
                        {
                                patternParser.PatternConverters[entry.Key] = 
entry.Value;
  @@ -880,6 +883,10 @@
                /// <param name="writer">The TextWriter to write the formatted 
event to</param>
                override public void Format(TextWriter writer, LoggingEvent 
loggingEvent) 
                {
  +                     if (writer == null)
  +                     {
  +                             throw new ArgumentNullException("writer");
  +                     }
                        if (loggingEvent == null)
                        {
                                throw new ArgumentNullException("loggingEvent");