cvs commit: logging-log4net/src/Appender RollingFileAppender.cs

[nicko]

nicko       2005/08/14 14:41:19

  Modified:    src/Appender RollingFileAppender.cs
  Log:
  Fix LOG4NET-25. Ensure that m_scheduledFilename is not built until after File 
has been set to fully qualified path
  
  Revision  Changes    Path
  1.23      +5 -5      logging-log4net/src/Appender/RollingFileAppender.cs
  
  Index: RollingFileAppender.cs
  ===================================================================
  RCS file: /home/cvs/logging-log4net/src/Appender/RollingFileAppender.cs,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- RollingFileAppender.cs    18 Jul 2005 18:44:24 -0000      1.22
  +++ RollingFileAppender.cs    14 Aug 2005 21:41:19 -0000      1.23
  @@ -940,11 +940,6 @@
                                        ErrorHandler.Error("Either DatePattern 
or rollingStyle options are not set for ["+Name+"].");

                                }

                        }

  -     

  -                     if (m_rollDate && File != null && m_scheduledFilename 
== null)

  -                     {

  -                             m_scheduledFilename = File + 
m_now.ToString(m_datePattern, 
System.Globalization.DateTimeFormatInfo.InvariantInfo);

  -                     }

   

                        if (SecurityContext == null)

                        {

  @@ -962,6 +957,11 @@
                                m_baseFileName = base.File;

                        }

   

  +                     if (m_rollDate && File != null && m_scheduledFilename 
== null)

  +                     {

  +                             m_scheduledFilename = File + 
m_now.ToString(m_datePattern, 
System.Globalization.DateTimeFormatInfo.InvariantInfo);

  +                     }

  +

                        ExistingInit();

        

                        base.ActivateOptions();