diff options
Diffstat (limited to 'vid-app-common/src/main')
| -rw-r--r-- | vid-app-common/src/main/java/org/onap/vid/mso/MsoUtil.java | 3 | ||||
| -rwxr-xr-x | vid-app-common/src/main/webapp/WEB-INF/web.xml | 17 |
2 files changed, 2 insertions, 18 deletions
diff --git a/vid-app-common/src/main/java/org/onap/vid/mso/MsoUtil.java b/vid-app-common/src/main/java/org/onap/vid/mso/MsoUtil.java index 5171b7ac8..626816f7f 100644 --- a/vid-app-common/src/main/java/org/onap/vid/mso/MsoUtil.java +++ b/vid-app-common/src/main/java/org/onap/vid/mso/MsoUtil.java @@ -49,7 +49,8 @@ public class MsoUtil { if (httpResponse.getRawBody() != null) { try { T body = httpResponse.getBody(); - String entityStr = body instanceof String ? (String) body : JACKSON_OBJECT_MAPPER.writeValueAsString(httpResponse.getBody()); + String entityStr = (body instanceof String || body==null) ? (String) body : + JACKSON_OBJECT_MAPPER.writeValueAsString(httpResponse.getBody()); msoResponseWrapper.setEntity(entityStr); } catch(JsonProcessingException e) { ExceptionUtils.rethrow(e); diff --git a/vid-app-common/src/main/webapp/WEB-INF/web.xml b/vid-app-common/src/main/webapp/WEB-INF/web.xml deleted file mode 100755 index 7f0a40ef2..000000000 --- a/vid-app-common/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee"
- xmlns:web="http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
- version="3.1" xmlns="http://xmlns.jcp.org/xml/ns/javaee">
-
- <display-name>vid-common</display-name>
-
- <!-- The app can function on a HA cluster -->
- <distributable />
-
- <session-config>
- <session-timeout>7</session-timeout>
- <tracking-mode>COOKIE</tracking-mode>
- </session-config>
-
-</web-app>
|