Merge branch '1.5.x'

2017-04-10 14:18:48 +02:00
parent b3bcecc988 b4a1feae91
commit dbe388756a
1 changed files with 1 additions and 0 deletions
--- 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);
 	}