Skip to content
This repository was archived by the owner on May 30, 2024. It is now read-only.

Commit 692414d

Browse files
authored
Merge pull request #101 from launchdarkly/dr/2.3.1
Dr/2.3.1
2 parents 063d579 + d06ac9d commit 692414d

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
.gradle/
1414
build/
1515
bin/
16-
16+
out/
1717
classes/

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ dependencies {
3131
compile "com.google.guava:guava:19.0"
3232
compile "joda-time:joda-time:2.9.3"
3333
compile "org.slf4j:slf4j-api:1.7.21"
34-
compile group: "com.launchdarkly", name: "okhttp-eventsource", version: "1.3.2", changing: true
34+
compile group: "com.launchdarkly", name: "okhttp-eventsource", version: "1.5.0", changing: true
3535
compile "redis.clients:jedis:2.9.0"
3636
testCompile "org.easymock:easymock:3.4"
3737
testCompile 'junit:junit:4.12'

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
version=2.3.0
1+
version=2.3.1-SNAPSHOT
22
ossrhUsername=
33
ossrhPassword=

src/main/java/com/launchdarkly/client/StreamProcessor.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,8 @@ public void onError(Throwable throwable) {
131131

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

136137
if (config.proxy != null) {
137138
builder.proxy(config.proxy);

0 commit comments

Comments
 (0)