Fix load balancing stickiness

Author: mpv1989

src/main/java/com/arangodb/ArangoCursor.java

@@ -34,7 +34,6 @@
 import com.arangodb.internal.ArangoCursorExecute;
 import com.arangodb.internal.ArangoCursorIterator;
 import com.arangodb.internal.InternalArangoDatabase;
-import com.arangodb.internal.net.HostHandle;
 
 /**
  * @author Mark Vollmary
@@ -46,25 +45,22 @@ public class ArangoCursor<T> implements Iterable<T>, Iterator<T>, Closeable {
 	protected final ArangoCursorIterator<T> iterator;
 	private final String id;
 	private final ArangoCursorExecute execute;
-	private final HostHandle hostHandle;
 
 	protected ArangoCursor(final InternalArangoDatabase<?, ?, ?, ?> db, final ArangoCursorExecute execute,
 		final Class<T> type, final CursorEntity result) {
 		super();
 		this.execute = execute;
 		this.type = type;
-		hostHandle = new HostHandle();
-		iterator = createIterator(this, db, execute, result, hostHandle);
+		iterator = createIterator(this, db, execute, result);
 		id = result.getId();
 	}
 
 	protected ArangoCursorIterator<T> createIterator(
 		final ArangoCursor<T> cursor,
 		final InternalArangoDatabase<?, ?, ?, ?> db,
 		final ArangoCursorExecute execute,
-		final CursorEntity result,
-		final HostHandle hostHandle) {
-		return new ArangoCursorIterator<T>(cursor, execute, db, result, hostHandle);
+		final CursorEntity result) {
+		return new ArangoCursorIterator<T>(cursor, execute, db, result);
 	}
 
 	/**
@@ -107,7 +103,7 @@ public boolean isCached() {
 	@Override
 	public void close() throws IOException {
 		if (id != null) {
-			execute.close(id, hostHandle);
+			execute.close(id);
 		}
 	}
 

src/main/java/com/arangodb/ArangoDatabase.java

@@ -355,8 +355,9 @@ public <T> ArangoCursor<T> query(
 		final AqlQueryOptions options,
 		final Class<T> type) throws ArangoDBException {
 		final Request request = queryRequest(query, bindVars, options);
-		final CursorEntity result = executor.execute(request, CursorEntity.class);
-		return createCursor(result, type);
+		final HostHandle hostHandle = new HostHandle();
+		final CursorEntity result = executor.execute(request, CursorEntity.class, hostHandle);
+		return createCursor(result, type, hostHandle);
 	}
 
 	/**
@@ -373,19 +374,23 @@ public <T> ArangoCursor<T> query(
 	 * @throws ArangoDBException
 	 */
 	public <T> ArangoCursor<T> cursor(final String cursorId, final Class<T> type) throws ArangoDBException {
-		final CursorEntity result = executor.execute(queryNextRequest(cursorId), CursorEntity.class);
-		return createCursor(result, type);
+		final HostHandle hostHandle = new HostHandle();
+		final CursorEntity result = executor.execute(queryNextRequest(cursorId), CursorEntity.class, hostHandle);
+		return createCursor(result, type, hostHandle);
 	}
 
-	private <T> ArangoCursor<T> createCursor(final CursorEntity result, final Class<T> type) {
+	private <T> ArangoCursor<T> createCursor(
+		final CursorEntity result,
+		final Class<T> type,
+		final HostHandle hostHandle) {
 		final ArangoCursorExecute execute = new ArangoCursorExecute() {
 			@Override
-			public CursorEntity next(final String id, final HostHandle hostHandle) {
+			public CursorEntity next(final String id) {
 				return executor.execute(queryNextRequest(id), CursorEntity.class, hostHandle);
 			}
 
 			@Override
-			public void close(final String id, final HostHandle hostHandle) {
+			public void close(final String id) {
 				executor.execute(queryCloseRequest(id), Void.class, hostHandle);
 			}
 		};

src/main/java/com/arangodb/internal/ArangoCursorExecute.java

@@ -22,16 +22,15 @@
 
 import com.arangodb.ArangoDBException;
 import com.arangodb.entity.CursorEntity;
-import com.arangodb.internal.net.HostHandle;
 
 /**
  * @author Mark Vollmary
  *
  */
 public interface ArangoCursorExecute {
 
-	CursorEntity next(String id, HostHandle hostHandle) throws ArangoDBException;
+	CursorEntity next(String id) throws ArangoDBException;
 
-	void close(String id, HostHandle hostHandle) throws ArangoDBException;
+	void close(String id) throws ArangoDBException;
 
 }

src/main/java/com/arangodb/internal/ArangoCursorIterator.java

@@ -25,7 +25,6 @@
 
 import com.arangodb.ArangoCursor;
 import com.arangodb.entity.CursorEntity;
-import com.arangodb.internal.net.HostHandle;
 import com.arangodb.velocypack.VPackSlice;
 
 /**
@@ -41,16 +40,14 @@ public class ArangoCursorIterator<T> implements Iterator<T> {
 	private final ArangoCursor<T> cursor;
 	private final InternalArangoDatabase<?, ?, ?, ?> db;
 	private final ArangoCursorExecute execute;
-	private final HostHandle hostHandle;
 
 	public ArangoCursorIterator(final ArangoCursor<T> cursor, final ArangoCursorExecute execute,
-		final InternalArangoDatabase<?, ?, ?, ?> db, final CursorEntity result, final HostHandle hostHandle) {
+		final InternalArangoDatabase<?, ?, ?, ?> db, final CursorEntity result) {
 		super();
 		this.cursor = cursor;
 		this.execute = execute;
 		this.db = db;
 		this.result = result;
-		this.hostHandle = hostHandle;
 		pos = 0;
 	}
 
@@ -66,7 +63,7 @@ public boolean hasNext() {
 	@Override
 	public T next() {
 		if (pos >= result.getResult().size() && result.getHasMore()) {
-			result = execute.next(cursor.getId(), hostHandle);
+			result = execute.next(cursor.getId());
 			pos = 0;
 		}
 		if (!hasNext()) {

src/main/java/com/arangodb/internal/http/HttpConnection.java

@@ -149,6 +149,9 @@ public long getKeepAliveDuration(final HttpResponse response, final HttpContext
 
 	@Override
 	public Host getHost() {
+		if (host == null) {
+			host = hostHandler.get();
+		}
 		return host;
 	}
 

src/main/java/com/arangodb/internal/net/DelHostHandler.java

@@ -34,7 +34,7 @@ public class DelHostHandler implements HostHandler {
 	public DelHostHandler(final HostHandler hostHandler, final Host host) {
 		super();
 		this.hostHandler = hostHandler;
-		this.host = host;
+		this.host = host != null ? host : hostHandler.get();
 	}
 
 	@Override

src/main/java/com/arangodb/internal/velocystream/internal/VstConnection.java

@@ -83,6 +83,9 @@ protected VstConnection(final HostHandler hostHandler, final Integer timeout, fi
 
 	@Override
 	public Host getHost() {
+		if (host == null) {
+			host = hostHandler.get();
+		}
 		return host;
 	}