Repository: logging-log4net Updated Branches: refs/heads/feature/cd-pipeline 1341e34c8 -> c7cf31f82
Refactor: fixed indentation in the RollingFileAppender class Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/c7cf31f8 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/c7cf31f8 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/c7cf31f8 Branch: refs/heads/feature/cd-pipeline Commit: c7cf31f822c4116c486ebf327fdafed81cf6ed2b Parents: 1341e34 Author: Dominik Psenner <dpsen...@apache.org> Authored: Fri Jul 28 18:08:13 2017 +0200 Committer: Dominik Psenner <dpsen...@apache.org> Committed: Fri Jul 28 18:08:13 2017 +0200 ---------------------------------------------------------------------- src/Appender/RollingFileAppender.cs | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/c7cf31f8/src/Appender/RollingFileAppender.cs ---------------------------------------------------------------------- diff --git a/src/Appender/RollingFileAppender.cs b/src/Appender/RollingFileAppender.cs index 1bcf0e0..9c63f69 100644 --- a/src/Appender/RollingFileAppender.cs +++ b/src/Appender/RollingFileAppender.cs @@ -1481,24 +1481,24 @@ namespace log4net.Appender string archiveFileBaseName = baseFileName; if (!m_staticLogFileName) { - if (m_preserveLogFileNameExtension) - { - string extension = Path.GetExtension(archiveFileBaseName); - string baseName = Path.GetFileNameWithoutExtension(archiveFileBaseName); - int lastDotIndex = baseName.LastIndexOf("."); - if (lastDotIndex >= 0) + if (m_preserveLogFileNameExtension) { - archiveFileBaseName = baseName.Substring(0, lastDotIndex) + extension; + string extension = Path.GetExtension(archiveFileBaseName); + string baseName = Path.GetFileNameWithoutExtension(archiveFileBaseName); + int lastDotIndex = baseName.LastIndexOf("."); + if (lastDotIndex >= 0) + { + archiveFileBaseName = baseName.Substring(0, lastDotIndex) + extension; + } } - } - else - { - int lastDotIndex = archiveFileBaseName.LastIndexOf("."); - if (lastDotIndex >= 0) + else { - archiveFileBaseName = archiveFileBaseName.Substring(0, lastDotIndex); + int lastDotIndex = archiveFileBaseName.LastIndexOf("."); + if (lastDotIndex >= 0) + { + archiveFileBaseName = archiveFileBaseName.Substring(0, lastDotIndex); + } } - } } // Delete the archive file