Skip to content

Commit 2378b75

Browse files
authored
Merge pull request #203 from oceanbase/fix_table_null_ptr
[fix] setRpcExecuteTimeout access null ptr
2 parents c5f4270 + 8867bb4 commit 2378b75

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

src/main/java/com/alipay/oceanbase/rpc/ObTableClient.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1067,11 +1067,16 @@ public String getIndexTableName(final String dataTableName, final String indexNa
10671067
public void setRpcExecuteTimeout(int rpcExecuteTimeout) {
10681068
this.properties.put(RPC_EXECUTE_TIMEOUT.getKey(), String.valueOf(rpcExecuteTimeout));
10691069
this.rpcExecuteTimeout = rpcExecuteTimeout;
1070-
for (ObTable obTable : tableRoster.values()) {
1071-
if (obTable != null) {
1072-
obTable.setObTableExecuteTimeout(rpcExecuteTimeout);
1070+
if (null != tableRoster) {
1071+
for (ObTable obTable : tableRoster.values()) {
1072+
if (obTable != null) {
1073+
obTable.setObTableExecuteTimeout(rpcExecuteTimeout);
1074+
}
10731075
}
10741076
}
1077+
if (null != odpTable) {
1078+
odpTable.setObTableExecuteTimeout(rpcExecuteTimeout);
1079+
}
10751080
}
10761081

10771082
public String constructIndexTableName(final String dataTableName, final String indexName)

0 commit comments

Comments
 (0)