Skip to content

fix for issue 233 #250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 10, 2019
Merged

fix for issue 233 #250

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2ef45cb
fix for https://github.com/arangodb/arangodb-java-driver/issues/233
BCaxelbecker Mar 8, 2019
6978971
fix
BCaxelbecker May 10, 2019
53f2640
Merge branch 'master' into fix/233
BCaxelbecker May 10, 2019
0dbc4d2
fix
BCaxelbecker May 10, 2019
03a3793
Merge branch 'fix/233' of https://github.com/arangodb/arangodb-java-d…
BCaxelbecker May 10, 2019
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' into fix/233
  • Loading branch information
@BCaxelbecker
BCaxelbecker authored May 10, 2019
commit 53f264021628db16ad62a5f3db47887c60b91dfd
4 changes: 3 additions & 1 deletion src/main/java/com/arangodb/internal/net/ExtendedHostResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ public void init(final EndpointResolver resolver) {
}

@Override

public HostSet resolve(final boolean initial, final boolean closeConnections) {

if (!initial && isExpired()) {
Expand All @@ -72,7 +73,6 @@ public HostSet resolve(final boolean initial, final boolean closeConnections) {
LOGGER.info("Resolve " + endpoints.size() + " Endpoints");
LOGGER.debug("Endpoints " + Arrays.deepToString(endpoints.toArray()));


if (!endpoints.isEmpty()) {
hosts.clear();
}
Expand All @@ -86,6 +86,8 @@ public HostSet resolve(final boolean initial, final boolean closeConnections) {
if (s.length == 2) {
final HostDescription description = new HostDescription(s[0], Integer.valueOf(s[1]));
hosts.addHost(HostUtils.createHost(description, maxConnections, connectionFactory));
} else {
LOGGER.warn("Skip Endpoint (Missung Port)" + endpoint);
}

} else {
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.