You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2016/07/18 22:40:59 UTC
[7/8] incubator-trafodion git commit: Merging HEAD into sbroeder_2095
Merging HEAD into sbroeder_2095
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/9bbee32d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/9bbee32d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/9bbee32d
Branch: refs/heads/master
Commit: 9bbee32d530e92a8bcaf9786a47ea500aa6d413d
Parents: 440123a
Author: Sean Broeder <sb...@edev06.esgyn.local>
Authored: Sun Jul 17 09:17:04 2016 +0000
Committer: Sean Broeder <sb...@edev06.esgyn.local>
Committed: Sun Jul 17 09:17:04 2016 +0000
----------------------------------------------------------------------
.../main/java/org/trafodion/dtm/HBaseTxClient.java | 17 ++---------------
1 file changed, 2 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9bbee32d/core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/dtm/HBaseTxClient.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/dtm/HBaseTxClient.java b/core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/dtm/HBaseTxClient.java
index 682150c..f296c7b 100644
--- a/core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/dtm/HBaseTxClient.java
+++ b/core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/dtm/HBaseTxClient.java
@@ -694,23 +694,10 @@ public class HBaseTxClient {
LOG.error("Error while getting HTableDescriptor caused by : ", de);
throw new IOException("Error while getting HTableDescriptor caused by : ", de);
}
- catch(Exception e) {
- if (LOG.isTraceEnabled()) LOG.trace("HBaseTxClient:callCreateTable exception in htdesc parseFrom, retval: " +
- TransReturnCode.RET_EXCEPTION.toString() +
- " txid: " + transactionId +
- " DeserializationException: " + e);
- StringWriter sw = new StringWriter();
- PrintWriter pw = new PrintWriter(sw);
- e.printStackTrace(pw);
- LOG.error(sw.toString());
-
- throw new Exception("DeserializationException in callCreateTable parseFrom, unable to send callCreateTable");
- }
-
try {
trxManager.createTable(ts, htdesc, beginEndKeys);
}
- catch (Exception cte) {
+ catch (IOException cte) {
if (LOG.isTraceEnabled()) LOG.trace("HBaseTxClient:callCreateTable exception trxManager.createTable, retval: " +
TransReturnCode.RET_EXCEPTION.toString() +" txid: " + transactionId +" Exception: " + cte);
StringWriter sw = new StringWriter();
@@ -718,7 +705,7 @@ public class HBaseTxClient {
cte.printStackTrace(pw);
LOG.error("HBaseTxClient createTable call error: " + sw.toString());
- throw new Exception("createTable call error");
+ throw new IOException("createTable call error", cte);
}