svn commit: r1172969 - in /logging/log4net/trunk/src: Repository/Hierarchy/Logger.cs Util/SystemStringFormat.cs

[bodewig]

Author: bodewig
Date: Tue Sep 20 04:07:31 2011
New Revision: 1172969

URL: http://svn.apache.org/viewvc?rev=1172969&view=rev
Log:
Mono 2.0 doesn't like catch blocks without an exception either

Modified:
    logging/log4net/trunk/src/Repository/Hierarchy/Logger.cs
    logging/log4net/trunk/src/Util/SystemStringFormat.cs

Modified: logging/log4net/trunk/src/Repository/Hierarchy/Logger.cs
URL: 
http://svn.apache.org/viewvc/logging/log4net/trunk/src/Repository/Hierarchy/Logger.cs?rev=1172969&r1=1172968&r2=1172969&view=diff
==============================================================================
--- logging/log4net/trunk/src/Repository/Hierarchy/Logger.cs (original)
+++ logging/log4net/trunk/src/Repository/Hierarchy/Logger.cs Tue Sep 20 
04:07:31 2011
@@ -432,7 +432,7 @@ namespace log4net.Repository.Hierarchy
                        {
                                log4net.Util.LogLog.Error(declaringType, 
"Exception while logging", ex);
                        }
-#if !NET_2_0
+#if !NET_2_0 && !MONO_2_0
                        catch
                        {
                                log4net.Util.LogLog.Error(declaringType, 
"Exception while logging");
@@ -469,7 +469,7 @@ namespace log4net.Repository.Hierarchy
                        {
                                log4net.Util.LogLog.Error(declaringType, 
"Exception while logging", ex);
                        }
-#if !NET_2_0
+#if !NET_2_0 && !MONO_2_0
                        catch
                        {
                                log4net.Util.LogLog.Error(declaringType, 
"Exception while logging");
@@ -509,7 +509,7 @@ namespace log4net.Repository.Hierarchy
                        {
                                log4net.Util.LogLog.Error(declaringType, 
"Exception while logging", ex);
                        }
-#if !NET_2_0
+#if !NET_2_0 && !MONO_2_0
                        catch
                        {
                                log4net.Util.LogLog.Error(declaringType, 
"Exception while logging");

Modified: logging/log4net/trunk/src/Util/SystemStringFormat.cs
URL: 
http://svn.apache.org/viewvc/logging/log4net/trunk/src/Util/SystemStringFormat.cs?rev=1172969&r1=1172968&r2=1172969&view=diff
==============================================================================
--- logging/log4net/trunk/src/Util/SystemStringFormat.cs (original)
+++ logging/log4net/trunk/src/Util/SystemStringFormat.cs Tue Sep 20 04:07:31 
2011
@@ -109,7 +109,7 @@ namespace log4net.Util
                                log4net.Util.LogLog.Warn(declaringType, 
"Exception while rendering format ["+format+"]", ex);
                                return StringFormatError(ex, format, args);
                        }
-#if !NET_2_0
+#if !NET_2_0 && !MONO_2_0
                        catch
                        {
                                log4net.Util.LogLog.Warn(declaringType, 
"Exception while rendering format ["+format+"]");
@@ -148,7 +148,7 @@ namespace log4net.Util
                                log4net.Util.LogLog.Error(declaringType, 
"INTERNAL ERROR during StringFormat error handling", ex);
                                return "<log4net.Error>Exception during 
StringFormat. See Internal Log.</log4net.Error>";
                        }
-#if !NET_2_0
+#if !NET_2_0 && !MONO_2_0
                        catch
                        {
                                log4net.Util.LogLog.Error(declaringType, 
"INTERNAL ERROR during StringFormat error handling");
@@ -210,7 +210,7 @@ namespace log4net.Util
                                {
                                        buffer.Append("<Exception: 
").Append(ex.Message).Append(">");
                                }
-#if !NET_2_0
+#if !NET_2_0 && !MONO_2_0
                                catch
                                {
                                        buffer.Append("<Exception>");