Compare commits

...

7 Commits

Author SHA1 Message Date
mtuhai
6215c5164d TBD-7768: fix 2018-10-05 13:29:40 +03:00
BOURGEOIS Laurent
941f201922 Merge branch 'master' of github.com:Talend/tdi-studio-se into slemoing/cdh600_integ 2018-09-17 14:44:31 +02:00
BOURGEOIS Laurent
6aaddb6265 Merge branch 'master' of github.com:Talend/tdi-studio-se into slemoing/cdh600_integ 2018-09-07 10:09:25 +02:00
BOURGEOIS Laurent
2c28451c42 Remove comments 2018-09-06 16:00:04 +02:00
BOURGEOIS Laurent
3aa5848649 Merge branch 'master' of github.com:Talend/tdi-studio-se into slemoing/cdh600_integ 2018-09-06 15:45:37 +02:00
BOURGEOIS Laurent
266e5320f2 Merge branch 'master' of github.com:Talend/tdi-studio-se into slemoing/cdh600_integ 2018-09-04 14:54:26 +02:00
BOURGEOIS Laurent
2dddbe58f2 Add HBase 2.x support 2018-08-24 17:10:33 +02:00

View File

@@ -1116,12 +1116,17 @@ if (execStat) {
if(conn_<%=hbaseComponent.getUniqueName()%> != null )
{
<%
if((isCustom && isHadoop2) || (!isCustom && hbaseDistrib.doSupportNewHBaseAPI())) {%>
org.apache.hadoop.hbase.client.HConnection hConnection_<%=hbaseComponent.getUniqueName() %> = org.apache.hadoop.hbase.client.HConnectionManager.getConnection(conn_<%=hbaseComponent.getUniqueName() %>);
if((isCustom && isHadoop2) || (!isCustom && hbaseDistrib.doSupportNewHBaseAPI())) {
if (!hbaseDistrib.doSupportHBase2x()) {
%>
org.apache.hadoop.hbase.client.HConnection hConnection_<%=hbaseComponent.getUniqueName() %> = org.apache.hadoop.hbase.client.HConnectionManager.getConnection(conn_<%=hbaseComponent.getUniqueName() %>);
<% } else { %>
org.apache.hadoop.hbase.client.Connection hConnection_<%=hbaseComponent.getUniqueName() %> = org.apache.hadoop.hbase.client.ConnectionFactory.createConnection(conn_<%=hbaseComponent.getUniqueName() %>);
<% } %>
if ((hConnection_<%=hbaseComponent.getUniqueName() %> != null) && (!hConnection_<%=hbaseComponent.getUniqueName() %>.isClosed())) {
hConnection_<%=hbaseComponent.getUniqueName() %>.close();
}
<%} else {%>
<%} else if (!hbaseDistrib.doSupportHBase2x()) {%>
org.apache.hadoop.hbase.client.HConnectionManager.deleteConnection(conn_<%=hbaseComponent.getUniqueName() %>,true);
<%}%>
}