From 8ec7ca5b8bcdf67923691fc789c527811258840e Mon Sep 17 00:00:00 2001
From: Dan Richelson <dan@launchdarkly.com>
Date: Fri, 11 Aug 2017 10:16:53 -0700
Subject: [PATCH 1/2] Update okhttp-eventsource to latest. Wire in timeout to
 okhttp-eventsource

---
 build.gradle                                               | 2 +-
 gradle.properties                                          | 2 +-
 src/main/java/com/launchdarkly/client/StreamProcessor.java | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index e6de15b58..105e26056 100644
--- a/build.gradle
+++ b/build.gradle
@@ -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'
diff --git a/gradle.properties b/gradle.properties
index 50208f9f8..a85864305 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
-version=2.3.0
+version=2.3.1-SNAPSHOT
 ossrhUsername=
 ossrhPassword=
\ No newline at end of file
diff --git a/src/main/java/com/launchdarkly/client/StreamProcessor.java b/src/main/java/com/launchdarkly/client/StreamProcessor.java
index e42a5c9cd..7ae199893 100644
--- a/src/main/java/com/launchdarkly/client/StreamProcessor.java
+++ b/src/main/java/com/launchdarkly/client/StreamProcessor.java
@@ -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);

From d06ac9df20a1902d6e81151fe1ff9d08cfa13812 Mon Sep 17 00:00:00 2001
From: Dan Richelson <dan@launchdarkly.com>
Date: Fri, 11 Aug 2017 13:55:23 -0700
Subject: [PATCH 2/2] add out dir to .gitignore

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 6999e62b3..e368b8cda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,5 +13,5 @@
 .gradle/
 build/
 bin/
-
+out/
 classes/
\ No newline at end of file