X-Git-Url: https://git.pterodactylus.net/?p=rhynodge.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Freactor%2Floader%2FChainWatcher.java;h=a6a5004be6440b6b9dc0d9183c8bfb7c4a4278d0;hp=10abcc5a883a1e023c4918fad06f9cdd7eac39c5;hb=d959856be39657398f81519240b4e3baa497efa0;hpb=78d6c1bdd74b83235b4eb8ca4654e60846f9b421

diff --git a/src/main/java/net/pterodactylus/reactor/loader/ChainWatcher.java b/src/main/java/net/pterodactylus/reactor/loader/ChainWatcher.java
index 10abcc5..a6a5004 100644
--- a/src/main/java/net/pterodactylus/reactor/loader/ChainWatcher.java
+++ b/src/main/java/net/pterodactylus/reactor/loader/ChainWatcher.java
@@ -24,14 +24,16 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.concurrent.TimeUnit;
 
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Unmarshaller;
+
 import net.pterodactylus.reactor.Reaction;
 import net.pterodactylus.reactor.engine.Engine;
 import net.pterodactylus.reactor.loader.Chain.Parameter;
 import net.pterodactylus.reactor.loader.Chain.Part;
 
 import org.apache.log4j.Logger;
-import org.simpleframework.xml.Serializer;
-import org.simpleframework.xml.core.Persister;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.Maps;
@@ -191,9 +193,15 @@ public class ChainWatcher extends AbstractExecutionThreadService {
 	 * @return The parsed chain
 	 */
 	private static Chain parseXmlFile(File xmlFile) {
-		Serializer serializer = new Persister();
-		logger.debug(String.format("Reading %s...", xmlFile.getPath()));
-		return serializer.read(Chain.class, xmlFile);
+		try {
+			JAXBContext context = JAXBContext.newInstance(Chain.class);
+			Unmarshaller unmarshaller = context.createUnmarshaller();
+			logger.debug(String.format("Reading %s...", xmlFile.getPath()));
+			return (Chain) unmarshaller.unmarshal(xmlFile);
+		} catch (JAXBException e) {
+			e.printStackTrace();
+			return null;
+		}
 	}
 
 }