lalala

[mono.git] / mcs / class / corlib / System.IO / FileLoadException.cs

diff --git a/mcs/class/corlib/System.IO/FileLoadException.cs b/mcs/class/corlib/System.IO/FileLoadException.cs
index e2399427ed8f623a79a01c4519fe2dd2d337d24b..2ee1546b36c657cb39a5bfd3fa0a49457d0a1e3b 100755 (executable)
--- a/mcs/class/corlib/System.IO/FileLoadException.cs
+++ b/mcs/class/corlib/System.IO/FileLoadException.cs
@@ -52,8 +52,8 @@ namespace System.IO {
                public FileLoadException (string message, string fileName, Exception inner)
                        : base (message, inner)
                {
-                       this.msg = message
-                       this.fileName = fileName
+                       this.msg = message;
+                       this.fileName = fileName;
                        this.inner = inner;
                }
 
@@ -69,8 +69,7 @@ namespace System.IO {
                        get {
                                if (fileName != null)
                                        return Locale.GetText (msg + ": " + fileName);
-
-                               if (fileName == null)
+                               else
                                        return msg;
                        }
                }
@@ -93,11 +92,15 @@ namespace System.IO {
                        info.AddValue ("FileLoad_FusionLog", fusionLog);
                }
 
-               [MonoTODO (Add StackTrace into the output)]
                public override string ToString ()
                {
-                       return "System.IO.FileLoadException: " + Message;
+                       string result = GetType ().FullName + ": " + Message;
+                       if (this.InnerException != null)
+                               result +=" ----> " + InnerException;
+                       if (this.StackTrace != null)
+                               result += '\n' + StackTrace;
+
+                       return result;
                }
-               
        }
 }