From 59ea77e590deb8ccaa1161a709009057291dfc59 Mon Sep 17 00:00:00 2001
From: Brian Topping <brian@mauswerks.net>
Date: Mon, 22 Sep 2014 10:56:10 -0400
Subject: [PATCH] Add warning for bad XML parse of settings file

---
 ivy/src/main/scala/sbt/Resolver.scala | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ivy/src/main/scala/sbt/Resolver.scala b/ivy/src/main/scala/sbt/Resolver.scala
index f7318fb5a..b0a45f949 100644
--- a/ivy/src/main/scala/sbt/Resolver.scala
+++ b/ivy/src/main/scala/sbt/Resolver.scala
@@ -7,6 +7,7 @@ import java.io.File
 import java.net.URL
 import scala.xml.{ Text, NodeSeq, Elem, XML }
 import org.apache.ivy.plugins.resolver.DependencyResolver
+import org.xml.sax.SAXParseException
 
 sealed trait Resolver {
   def name: String
@@ -311,6 +312,7 @@ object Resolver {
       } catch {
         // Occurs inside File constructor when property or environment variable does not exist
         case _: NullPointerException => None
+        case e: SAXParseException    => System.err.println(s"WARNING: Problem parsing ${f().getAbsolutePath}, ${e.getMessage}"); None
       }
     loadHomeFromSettings(() => new File(Path.userHome, ".m2/settings.xml")) orElse
       loadHomeFromSettings(() => new File(new File(System.getenv("M2_HOME")), "conf/settings.xml")) getOrElse