You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mh...@apache.org on 2018/06/23 17:02:06 UTC
asterixdb git commit: [NO ISSUE][FAIL] Fix Message Propagation in
HyracksException
Repository: asterixdb
Updated Branches:
refs/heads/master e7ef6e949 -> d21c5eb0a
[NO ISSUE][FAIL] Fix Message Propagation in HyracksException
- user model changes: no
- storage format changes: no
- interface changes: no
Details:
- Properly propogate the message from the cause
in HyracksException.
Change-Id: If167755a000e60ca082bd1cc4692c747a502f6ae
Reviewed-on: https://asterix-gerrit.ics.uci.edu/2720
Reviewed-by: Murtadha Hubail <mh...@apache.org>
Sonar-Qube: Jenkins <je...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Contrib: Jenkins <je...@fulliautomatix.ics.uci.edu>
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Michael Blow <mb...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/d21c5eb0
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/d21c5eb0
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/d21c5eb0
Branch: refs/heads/master
Commit: d21c5eb0a0403822445eedc25878e3a2df9235d5
Parents: e7ef6e9
Author: Murtadha Hubail <mh...@apache.org>
Authored: Sat Jun 23 16:57:25 2018 +0300
Committer: Murtadha Hubail <mh...@apache.org>
Committed: Sat Jun 23 10:01:19 2018 -0700
----------------------------------------------------------------------
.../org/apache/hyracks/api/exceptions/HyracksException.java | 6 +++---
.../java/org/apache/hyracks/api/util/ErrorMessageUtil.java | 8 ++++++++
2 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d21c5eb0/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/exceptions/HyracksException.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/exceptions/HyracksException.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/exceptions/HyracksException.java
index 428e643..99747fa 100644
--- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/exceptions/HyracksException.java
+++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/exceptions/HyracksException.java
@@ -83,7 +83,7 @@ public class HyracksException extends IOException implements IFormattedException
*/
@Deprecated
protected HyracksException(Throwable cause) {
- this(ErrorMessageUtil.NONE, UNKNOWN, String.valueOf(cause), cause, (Serializable[]) null);
+ this(ErrorMessageUtil.NONE, UNKNOWN, ErrorMessageUtil.getCauseMessage(cause), cause, (Serializable[]) null);
}
/**
@@ -99,7 +99,7 @@ public class HyracksException extends IOException implements IFormattedException
}
public HyracksException(Throwable cause, int errorCode, Serializable... params) {
- this(ErrorMessageUtil.NONE, errorCode, String.valueOf(cause), cause, null, params);
+ this(ErrorMessageUtil.NONE, errorCode, ErrorMessageUtil.getCauseMessage(cause), cause, null, params);
}
public HyracksException(String component, int errorCode, String message, Serializable... params) {
@@ -107,7 +107,7 @@ public class HyracksException extends IOException implements IFormattedException
}
public HyracksException(String component, int errorCode, Throwable cause, Serializable... params) {
- this(component, errorCode, String.valueOf(cause), cause, null, params);
+ this(component, errorCode, ErrorMessageUtil.getCauseMessage(cause), cause, null, params);
}
public HyracksException(String component, int errorCode, String message, Throwable cause, Serializable... params) {
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d21c5eb0/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/ErrorMessageUtil.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/ErrorMessageUtil.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/ErrorMessageUtil.java
index 56dfe3f..8758ef7 100644
--- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/ErrorMessageUtil.java
+++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/ErrorMessageUtil.java
@@ -27,6 +27,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
+import org.apache.hyracks.api.exceptions.IFormattedException;
import org.apache.hyracks.api.exceptions.SourceLocation;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
@@ -113,4 +114,11 @@ public class ErrorMessageUtil {
return e.getMessage();
}
}
+
+ public static String getCauseMessage(Throwable t) {
+ if (t instanceof IFormattedException) {
+ return t.getMessage();
+ }
+ return String.valueOf(t);
+ }
}