Repository: reef Updated Branches: refs/heads/master fd4f6d047 -> 3531944f1
[REEF-1785] Remove usage of `Exceptions` class in O.A.R.Utilities project JIRA: [REEF-1785](https://issues.apache.org/jira/browse/REEF-1785) Pull Request: This closes #1295 Project: http://git-wip-us.apache.org/repos/asf/reef/repo Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/3531944f Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/3531944f Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/3531944f Branch: refs/heads/master Commit: 3531944f11cc115b105a6bec4268713766425034 Parents: fd4f6d0 Author: Markus Weimer <[email protected]> Authored: Wed Apr 19 16:58:49 2017 -0700 Committer: Doug Service <[email protected]> Committed: Thu Apr 27 23:32:03 2017 +0000 ---------------------------------------------------------------------- lang/cs/Org.Apache.REEF.Utilities/NetUtilities.cs | 2 +- lang/cs/Org.Apache.REEF.Utilities/Optional.cs | 2 +- .../Org.Apache.REEF.Utilities/Runtime/Yarn/YarnConfiguration.cs | 5 +---- lang/cs/Org.Apache.REEF.Utilities/ValidationUtilities.cs | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/reef/blob/3531944f/lang/cs/Org.Apache.REEF.Utilities/NetUtilities.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Utilities/NetUtilities.cs b/lang/cs/Org.Apache.REEF.Utilities/NetUtilities.cs index bd83b8b..4a0e31c 100644 --- a/lang/cs/Org.Apache.REEF.Utilities/NetUtilities.cs +++ b/lang/cs/Org.Apache.REEF.Utilities/NetUtilities.cs @@ -40,7 +40,7 @@ namespace Org.Apache.REEF.Utilities IPAddress.TryParse(driverAddress, out ipAddress); if (ipAddress == null) { - Exceptions.Throw(new FormatException("invalid format for ip: " + ipWithPort), LOGGER); + throw new FormatException("invalid format for ip: " + ipWithPort); } return new IPEndPoint(ipAddress, driverCommunicationPort); http://git-wip-us.apache.org/repos/asf/reef/blob/3531944f/lang/cs/Org.Apache.REEF.Utilities/Optional.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Utilities/Optional.cs b/lang/cs/Org.Apache.REEF.Utilities/Optional.cs index 1f6d958..3ab4bf4 100644 --- a/lang/cs/Org.Apache.REEF.Utilities/Optional.cs +++ b/lang/cs/Org.Apache.REEF.Utilities/Optional.cs @@ -60,7 +60,7 @@ namespace Org.Apache.REEF.Utilities { if (value == null) { - Diagnostics.Exceptions.Throw(new ArgumentNullException("value", "Passed a null value. Use OfNullable() instead"), Logger.GetLogger(typeof(Optional<T>))); + throw new ArgumentNullException("value", "Passed a null value. Use OfNullable() instead"); } return new Optional<T>(value); } http://git-wip-us.apache.org/repos/asf/reef/blob/3531944f/lang/cs/Org.Apache.REEF.Utilities/Runtime/Yarn/YarnConfiguration.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Utilities/Runtime/Yarn/YarnConfiguration.cs b/lang/cs/Org.Apache.REEF.Utilities/Runtime/Yarn/YarnConfiguration.cs index 82887a5..64b2b03 100644 --- a/lang/cs/Org.Apache.REEF.Utilities/Runtime/Yarn/YarnConfiguration.cs +++ b/lang/cs/Org.Apache.REEF.Utilities/Runtime/Yarn/YarnConfiguration.cs @@ -157,10 +157,7 @@ namespace Org.Apache.REEF.Utilities.Runtime.Yarn } catch (UriFormatException e) { - Exceptions.Caught(e, - Level.Warning, - "Unable to format " + rmWebAppAddressNodeText + " to URI", - Logger); + Logger.Log(Level.Warning, "Unable to format " + rmWebAppAddressNodeText + " to URI. Ignoring.", e); } } http://git-wip-us.apache.org/repos/asf/reef/blob/3531944f/lang/cs/Org.Apache.REEF.Utilities/ValidationUtilities.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Utilities/ValidationUtilities.cs b/lang/cs/Org.Apache.REEF.Utilities/ValidationUtilities.cs index c6ea3b8..dfd248f 100644 --- a/lang/cs/Org.Apache.REEF.Utilities/ValidationUtilities.cs +++ b/lang/cs/Org.Apache.REEF.Utilities/ValidationUtilities.cs @@ -32,7 +32,7 @@ namespace Org.Apache.REEF.Utilities { Console.WriteLine(string.Format(CultureInfo.InvariantCulture, "{0} not set. Please set the environment variable first. Exiting...", env)); string msg = string.Format(CultureInfo.InvariantCulture, "No {0} found.", env); - Diagnostics.Exceptions.Throw(new InvalidOperationException(msg), msg, LOGGER); + throw new InvalidOperationException(msg); } return envVariable; }
