Merge pull request #450 from dportabella/fix

fix for Soap11Fault bug when empty detail
eed3si9n · Nov 12, 2017 · 0782eae · 0782eae
2 parents 47054e0 + 95ecf7e
commit 0782eae
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/cli/src/main/resources/soap11.scala.template b/cli/src/main/resources/soap11.scala.template
@@ -2,15 +2,15 @@ package scalaxb
 
 case class Soap11Fault[+A](original: Any, detail: Option[A], headers: scala.xml.NodeSeq) extends Exception {
   def asFault[B: scalaxb.XMLFormat]: Soap11Fault[B] = Soap11Fault(original, detail map {
-    case x: soapenvelope11.Detail => x.any.head.value match {
+    case soapenvelope11.Detail(dataRecord :: _, _) => dataRecord.value match {
       case node: scala.xml.Node => scalaxb.fromXML[B](node)
       case _ => sys.error("unsupported fault: " + toString)
     }
     case _ => sys.error("unsupported fault: " + toString)
   }, headers)
   def asNillableFault[B: scalaxb.XMLFormat]: Soap11Fault[Option[B]] = Soap11Fault(original, detail map {
-    case x: soapenvelope11.Detail => x.any.head.value match {
-      case node: scala.xml.Node if scalaxb.Helper.isNil(node) => None 
+    case soapenvelope11.Detail(dataRecord :: _, _) => dataRecord.value match {
+      case node: scala.xml.Node if scalaxb.Helper.isNil(node) => None
       case node: scala.xml.Node                               => Some(scalaxb.fromXML[B](node))
       case _ => sys.error("unsupported fault: " + toString)
     }

diff --git a/cli/src/main/resources/soap11_async.scala.template b/cli/src/main/resources/soap11_async.scala.template
@@ -3,15 +3,15 @@ import scala.concurrent.Future
 
 case class Soap11Fault[+A](original: Any, detail: Option[A], headers: scala.xml.NodeSeq) extends Exception {
   def asFault[B: scalaxb.XMLFormat]: Soap11Fault[B] = Soap11Fault(original, detail map {
-    case x: soapenvelope11.Detail => x.any.head.value match {
+    case soapenvelope11.Detail(dataRecord :: _, _) => dataRecord.value match {
       case node: scala.xml.Node => scalaxb.fromXML[B](node)
       case _ => sys.error("unsupported fault: " + toString)
     }
     case _ => sys.error("unsupported fault: " + toString)
   }, headers)
   def asNillableFault[B: scalaxb.XMLFormat]: Soap11Fault[Option[B]] = Soap11Fault(original, detail map {
-    case x: soapenvelope11.Detail => x.any.head.value match {
-      case node: scala.xml.Node if scalaxb.Helper.isNil(node) => None 
+    case soapenvelope11.Detail(dataRecord :: _, _) => dataRecord.value match {
+      case node: scala.xml.Node if scalaxb.Helper.isNil(node) => None
       case node: scala.xml.Node                               => Some(scalaxb.fromXML[B](node))
       case _ => sys.error("unsupported fault: " + toString)
     }