Skip to content
This repository was archived by the owner on May 30, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@
.gradle/
build/
bin/

out/
classes/
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ dependencies {
compile "com.google.guava:guava:19.0"
compile "joda-time:joda-time:2.9.3"
compile "org.slf4j:slf4j-api:1.7.21"
compile group: "com.launchdarkly", name: "okhttp-eventsource", version: "1.3.2", changing: true
compile group: "com.launchdarkly", name: "okhttp-eventsource", version: "1.5.0", changing: true
compile "redis.clients:jedis:2.9.0"
testCompile "org.easymock:easymock:3.4"
testCompile 'junit:junit:4.12'
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
version=2.3.0
version=2.3.1-SNAPSHOT
ossrhUsername=
ossrhPassword=
3 changes: 2 additions & 1 deletion src/main/java/com/launchdarkly/client/StreamProcessor.java
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,8 @@ public void onError(Throwable throwable) {

EventSource.Builder builder = new EventSource.Builder(handler, URI.create(config.streamURI.toASCIIString() + "/flags"))
.headers(headers)
.reconnectTimeMs(config.reconnectTimeMs);
.reconnectTimeMs(config.reconnectTimeMs)
.connectTimeoutMs(config.connectTimeoutMillis);

if (config.proxy != null) {
builder.proxy(config.proxy);
Expand Down