Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use corresponding exception message, if null passed #90505

Merged
merged 8 commits into from
Jan 18, 2024
Merged

Use corresponding exception message, if null passed #90505

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f88ed3f
use corresponding exception message if null passed
OwnageIsMagic Aug 14, 2023
0edc44a
fix
OwnageIsMagic Aug 14, 2023
055da60
review fixes
OwnageIsMagic Oct 17, 2023
63eadaf
fix tests
OwnageIsMagic Oct 17, 2023
70a07d4
do not use default message if null passed for SystemException, Applic…
OwnageIsMagic Dec 6, 2023
53988f1
change COMException default message
OwnageIsMagic Dec 25, 2023
90748bf
Merge branch 'main' into patch-1
jozkee Jan 16, 2024
ab67239
Merge branch 'main' into patch-1
jozkee Jan 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix
  • Loading branch information
@OwnageIsMagic
OwnageIsMagic committed Dec 25, 2023
commit 0edc44a79a8ffa7f754200bb40fa30d8233984f7
4 changes: 2 additions & 2 deletions src/libraries/System.Formats.Asn1/src/System/Formats/Asn1/AsnContentException.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ public AsnContentException()
}

public AsnContentException(string? message)
: base(message ?? SR.ContentException_DefaultMessage ?? SR.ContentException_DefaultMessage)
: base(message ?? SR.ContentException_DefaultMessage)
{
}

public AsnContentException(string? message, Exception? inner)
: base(message ?? SR.ContentException_DefaultMessage ?? SR.ContentException_DefaultMessage, inner)
: base(message ?? SR.ContentException_DefaultMessage, inner)
{
}

Expand Down
6 changes: 3 additions & 3 deletions src/libraries/System.Private.CoreLib/src/System/InsufficientMemoryException.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ public InsufficientMemoryException(string? message)
public InsufficientMemoryException(string? message, Exception? innerException)
: base(message ??
#if CORECLR
GetMessageFromNativeResources(ExceptionMessageKind.OutOfMemory)
GetMessageFromNativeResources(ExceptionMessageKind.OutOfMemory),
#else
SR.Arg_OutOfMemoryException
SR.Arg_OutOfMemoryException,
#endif
, innerException)
innerException)
{
HResult = HResults.COR_E_INSUFFICIENTMEMORY;
}
Expand Down
6 changes: 3 additions & 3 deletions src/libraries/System.Private.CoreLib/src/System/OutOfMemoryException.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ public OutOfMemoryException(string? message)
public OutOfMemoryException(string? message, Exception? innerException)
: base(message ??
#if CORECLR
GetMessageFromNativeResources(ExceptionMessageKind.OutOfMemory)
GetMessageFromNativeResources(ExceptionMessageKind.OutOfMemory),
#else
SR.Arg_OutOfMemoryException
SR.Arg_OutOfMemoryException,
#endif
, innerException)
innerException)
{
HResult = HResults.COR_E_OUTOFMEMORY;
}
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/COMException.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ public override string ToString()
s.Append($"{GetType()} (0x{HResult:X8})");

string message = Message;
if (!string.IsNullOrEmpty(message ?? SR.Arg_COMException))
if (!string.IsNullOrEmpty(message))
{
s.Append(": ").Append(message ?? SR.Arg_COMException);
s.Append(": ").Append(message);
}

Exception? innerException = InnerException;
Expand Down
6 changes: 3 additions & 3 deletions src/libraries/System.Private.CoreLib/src/System/Threading/ThreadInterruptedException.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ public ThreadInterruptedException(string? message)
public ThreadInterruptedException(string? message, Exception? innerException)
: base(message ??
#if CORECLR
GetMessageFromNativeResources(ExceptionMessageKind.ThreadInterrupted)
GetMessageFromNativeResources(ExceptionMessageKind.ThreadInterrupted),
#else
SR.Threading_ThreadInterrupted
SR.Threading_ThreadInterrupted,
#endif
, innerException)
innerException)
{
HResult = HResults.COR_E_THREADINTERRUPTED;
}
Expand Down