nicko       2004/11/20 13:33:44

  Modified:    src/Appender RollingFileAppender.cs
               tests/src/Appender RollingFileAppenderTest.cs
  Log:
  Fixed RollingFileAppender tests
  
  Revision  Changes    Path
  1.13      +4 -2      logging-log4net/src/Appender/RollingFileAppender.cs
  
  Index: RollingFileAppender.cs
  ===================================================================
  RCS file: /home/cvs/logging-log4net/src/Appender/RollingFileAppender.cs,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- RollingFileAppender.cs    19 Nov 2004 21:48:59 -0000      1.12
  +++ RollingFileAppender.cs    20 Nov 2004 21:33:43 -0000      1.13
  @@ -652,10 +652,12 @@
   
                        using(SecurityContext.Impersonate(this))
                        {
  -                             directory = Path.GetDirectoryName(baseFilePath);
  +                             string fullPath = 
Path.GetFullPath(baseFilePath);
  +
  +                             directory = Path.GetDirectoryName(fullPath);
                                if (Directory.Exists(directory))
                                {
  -                                     string baseFileName = 
Path.GetFileName(baseFilePath);
  +                                     string baseFileName = 
Path.GetFileName(fullPath);
   
                                        string[] files = 
Directory.GetFiles(directory, GetWildcardPatternForFile(baseFileName));
        
  
  
  
  1.4       +4 -1      
logging-log4net/tests/src/Appender/RollingFileAppenderTest.cs
  
  Index: RollingFileAppenderTest.cs
  ===================================================================
  RCS file: 
/home/cvs/logging-log4net/tests/src/Appender/RollingFileAppenderTest.cs,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- RollingFileAppenderTest.cs        27 Feb 2004 13:03:38 -0000      1.3
  +++ RollingFileAppenderTest.cs        20 Nov 2004 21:33:44 -0000      1.4
  @@ -1493,7 +1493,10 @@
   
                private static ArrayList GetExistingFiles(string baseFilePath)
                {
  -                     return 
(ArrayList)Utils.InvokeMethod(typeof(RollingFileAppender), "GetExistingFiles", 
baseFilePath);
  +                     RollingFileAppender appender = new 
RollingFileAppender();
  +                     appender.SecurityContext = 
log4net.Util.NullSecurityContext.Instance;
  +
  +                     return (ArrayList)Utils.InvokeMethod(appender, 
"GetExistingFiles", baseFilePath);
                }
   
                private void InitializeRollBackups(RollingFileAppender 
appender, string baseFile, ArrayList arrayFiles)
  
  
  

Reply via email to