Merge pull request #185 from novoda/develop

Develop to Release

Author: Xavi Rigau

build.gradle

@@ -1,5 +1,5 @@
 allprojects {
-    version = '1.2.0'
+    version = '1.2.1'
     repositories {
         mavenCentral()
         google()

core/src/main/java/com/novoda/merlin/HttpRequestMaker.java

@@ -11,8 +11,9 @@ class HttpRequestMaker implements RequestMaker {
 
     @Override
     public Request head(Endpoint endpoint) {
+        HttpURLConnection urlConnection = null;
         try {
-            HttpURLConnection urlConnection = connectTo(endpoint);
+            urlConnection = connectTo(endpoint);
             urlConnection.setRequestProperty("Accept-Encoding", "");
 
             setConnectionToHeadRequest(urlConnection);
@@ -21,6 +22,10 @@ public Request head(Endpoint endpoint) {
             return new MerlinHttpRequest(urlConnection);
         } catch (IOException e) {
             throw new RequestException(e);
+        } finally {
+            if (urlConnection != null) {
+                urlConnection.disconnect();
+            }
         }
     }
 
@@ -55,7 +60,6 @@ public int getResponseCode() {
                 request.disconnect();
             }
         }
-
     }
 
 }

core/src/main/java/com/novoda/merlin/Register.java

@@ -18,7 +18,7 @@ void register(T registerable) {
     }
 
     List<T> registerables() {
-        return registerables;
+        return new ArrayList<>(registerables);
     }
 
     void clear() {

core/src/test/java/com/novoda/merlin/ConnectCallbackManagerTest.java

@@ -7,6 +7,7 @@
 import org.junit.Test;
 
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 
 public class ConnectCallbackManagerTest {
@@ -40,6 +41,15 @@ public void givenMultipleRegisteredConnectables_whenCallingOnConnect_thenCallsCo
         }
     }
 
+    @Test
+    public void givenRegisteredConnectable_whenCallingOnConnectAndAddingConnectable_thenCallsConnectForConnectable() {
+        Connectable connectable = givenRegisteredConnectableModifyingConnectables();
+
+        connectCallbackManager.onConnect();
+
+        verify(connectable).onConnect();
+    }
+
     private List<Connectable> givenMultipleRegisteredConnectables() {
         List<Connectable> connectables = new ArrayList<>();
 
@@ -57,4 +67,17 @@ private Connectable givenRegisteredConnectable() {
         return connectable;
     }
 
+    private Connectable givenRegisteredConnectableModifyingConnectables() {
+        Connectable connectable = new Connectable() {
+
+            @Override
+            public void onConnect() {
+                connectables.register(mock(Connectable.class));
+            }
+        };
+        Connectable spyConnectable = spy(connectable);
+        connectables.register(spyConnectable);
+        return spyConnectable;
+    }
+
 }