Skip to content

Commit 3ab8d63

Browse files
author
chengyitian
committed
AJ-729: fix issue about DBConnection;
1 parent f1b3ed3 commit 3ab8d63

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

src/com/xxdb/DBConnection.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -725,25 +725,25 @@ public boolean connect(String hostName, int port, String userId, String password
725725
return connect(hostName, port, userId, password, initialScript, enableHighAvailability, highAvailabilitySites, reconnect, false);
726726
}
727727

728-
public boolean connect(String hostName, int port, String userId, String password, String initialScript, boolean enableHighAvailability, String[] highAvailabilitySites, boolean reconnect, boolean enableLoadBalance, int tryReconnectNums) throws IOException {
729-
if (tryReconnectNums <= 0) {
730-
this.tryReconnectNums = -1;
731-
log.warn("If the param 'tryReconnectNums' less than or equal to 0, when reconnect will be unlimited attempts.");
732-
} else {
733-
this.tryReconnectNums = tryReconnectNums;
734-
}
735-
736-
return connect(hostName, port, userId, password, initialScript, enableHighAvailability, highAvailabilitySites, reconnect, enableLoadBalance);
728+
public boolean connect(String hostName, int port, String userId, String password, String initialScript, boolean enableHighAvailability, String[] highAvailabilitySites, boolean reconnect, boolean enableLoadBalance) throws IOException {
729+
return connect(hostName, port, userId, password, initialScript, enableHighAvailability, highAvailabilitySites, reconnect, enableLoadBalance, -1);
737730
}
738731

739-
public boolean connect(String hostName, int port, String userId, String password, String initialScript, boolean enableHighAvailability, String[] highAvailabilitySites, boolean reconnect, boolean enableLoadBalance) throws IOException {
732+
public boolean connect(String hostName, int port, String userId, String password, String initialScript, boolean enableHighAvailability, String[] highAvailabilitySites, boolean reconnect, boolean enableLoadBalance, int tryReconnectNums) throws IOException {
740733
mutex_.lock();
741734
try {
742735
this.uid_ = userId;
743736
this.pwd_ = password;
744737
this.initialScript_ = initialScript;
745738
this.enableHighAvailability_ = enableHighAvailability;
746739
this.loadBalance_ = enableLoadBalance;
740+
if (tryReconnectNums <= 0) {
741+
this.tryReconnectNums = -1;
742+
log.warn("If the param 'tryReconnectNums' less than or equal to 0, when reconnect will be unlimited attempts.");
743+
} else {
744+
this.tryReconnectNums = tryReconnectNums;
745+
}
746+
747747
if (this.loadBalance_ && !this.enableHighAvailability_)
748748
throw new RuntimeException("Cannot only enable loadbalance but not enable highAvailablity.");
749749

@@ -923,7 +923,7 @@ public void switchDataNode(Node node) throws IOException{
923923
}
924924
} while (!closed_ && (tryReconnectNums == -1 || attempt < tryReconnectNums));
925925

926-
if (!closed_)
926+
if (!closed_ && tryReconnectNums > 0)
927927
throw new RuntimeException("Connect to " + node.hostName + ":" + node.port + " failed after " + attempt + " reconnect attemps.");
928928

929929
if (initialScript_!=null && initialScript_.length() > 0){

0 commit comments

Comments
 (0)