From 2b57ba08067ddaf2a3c4bd20d1ed37acfc6afa69 Mon Sep 17 00:00:00 2001 From: Dominik Przybysz Date: Tue, 30 May 2017 12:54:36 +0200 Subject: [PATCH] Do not create xml or json when request does not look like xml or json --- .../groovy/pl/touk/mockserver/server/MockRequest.groovy | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mockserver/src/main/groovy/pl/touk/mockserver/server/MockRequest.groovy b/mockserver/src/main/groovy/pl/touk/mockserver/server/MockRequest.groovy index f8dc561..3657131 100644 --- a/mockserver/src/main/groovy/pl/touk/mockserver/server/MockRequest.groovy +++ b/mockserver/src/main/groovy/pl/touk/mockserver/server/MockRequest.groovy @@ -27,6 +27,9 @@ class MockRequest { } private static GPathResult inputToXml(String text) { + if (!text.startsWith('<')) { + return null + } try { return new XmlSlurper().parseText(text) } catch (Exception _) { @@ -36,7 +39,7 @@ class MockRequest { private static GPathResult inputToSoap(GPathResult xml) { try { - if (xml.name() == 'Envelope' && xml.Body.size() > 0) { + if (xml != null && xml.name() == 'Envelope' && xml.Body.size() > 0) { return getSoapBodyContent(xml) } else { return null @@ -51,6 +54,9 @@ class MockRequest { } private static Object inputToJson(String text) { + if (!text.startsWith('[') && !text.startsWith('{')) { + return null + } try { return new JsonSlurper().parseText(text) } catch (Exception _) {