Merge branch '1.5.x'

dbe38875 · Stephane Nicoll · b3bcecc9 · b4a1feae · dbe38875
Commit dbe38875 authored Apr 10, 2017 by Stephane Nicoll
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

AgentReloader.java .../springframework/boot/devtools/restart/AgentReloader.java +1 -0

No files found.
--- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/AgentReloader.java
+++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/AgentReloader.java
@@ -36,6 +36,7 @@ public abstract class AgentReloader {
 		Set<String> agentClasses = new LinkedHashSet<>();
 		agentClasses.add("org.zeroturnaround.javarebel.Integration");
 		agentClasses.add("org.zeroturnaround.javarebel.ReloaderFactory");
+		agentClasses.add("org.hotswap.agent.HotswapAgent");
 		AGENT_CLASSES = Collections.unmodifiableSet(agentClasses);
 	}