Merge branch '1.4.x' into 1.5.x

This commit is contained in:
Phillip Webb
2016-12-19 12:36:57 -08:00
330 changed files with 554 additions and 47 deletions

View File

@@ -86,4 +86,5 @@ public final class ChangedFiles implements Iterable<ChangedFile> {
public String toString() {
return this.sourceFolder + " " + this.files;
}
}

View File

@@ -249,6 +249,7 @@ public class LiveReloadServer {
/**
* {@link Runnable} to handle a single connection.
*
* @see Connection
*/
private class ConnectionHandler implements Runnable {

View File

@@ -63,6 +63,7 @@ public class RestartScopeInitializer
public String getConversationId() {
return null;
}
}
}

View File

@@ -65,4 +65,5 @@ public class ClassLoaderFileURLStreamHandler extends URLStreamHandler {
}
}
}

View File

@@ -198,6 +198,7 @@ public class TunnelClient implements SmartInitializingSingleton {
protected void stopAcceptingConnections() {
this.acceptConnections = false;
}
}
/**
@@ -221,5 +222,7 @@ public class TunnelClient implements SmartInitializingSingleton {
this.closed = true;
}
}
}
}

View File

@@ -118,6 +118,7 @@ public class DevToolPropertiesIntegrationTests {
public MyBean myBean() {
return new MyBean();
}
}
static class MyBean {
@@ -132,4 +133,5 @@ public class DevToolPropertiesIntegrationTests {
}
}
}

View File

@@ -79,6 +79,7 @@ public class DevToolsHomePropertiesPostProcessorTests {
protected File getHomeFolder() {
return DevToolsHomePropertiesPostProcessorTests.this.home;
}
}
}