diff options
| author |   Tal Gitelman <tal.gitelman@att.com> | 2018-11-07 15:41:55 +0200 |
|---|---|---|
| committer | Tal Gitelman <tal.gitelman@att.com> | 2018-11-07 17:49:19 +0200 |
| commit | 3edb71cfc640b32a7cea3ee0823350ef19dd7694 (patch) | |
| tree | c94bf2046a03f251f1d08bca7b7dca0f2ee8755d /catalog-be | |
| parent | a706d714e2d0f308abe6fea01f091a1c5a1fe5ee (diff) | |
Error displayed on deleting VF/VFC
- from Service Composition
Change-Id: I48c2256b0584c69b94c870eefd834eaf2891f56d
Issue-ID: SDC-1888
Signed-off-by: Tal Gitelman <tal.gitelman@att.com>
Diffstat (limited to 'catalog-be')
| -rw-r--r-- | catalog-be/src/main/java/org/openecomp/sdc/be/filters/BeServletFilter.java | 6 | ||||
| -rw-r--r-- | catalog-be/src/main/webapp/WEB-INF/web.xml | 27 |
2 files changed, 4 insertions, 29 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/filters/BeServletFilter.java b/catalog-be/src/main/java/org/openecomp/sdc/be/filters/BeServletFilter.java index c60a8d6783..bdee21efc5 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/filters/BeServletFilter.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/filters/BeServletFilter.java @@ -148,8 +148,10 @@ public class BeServletFilter implements ContainerRequestFilter, ContainerRespons log.debug("Close transaction from filter"); TitanDao titanDao = getTitanDao(); if (titanDao != null) { - if (responseContext.getStatus() == Response.Status.OK.getStatusCode() || - responseContext.getStatus() == Response.Status.CREATED.getStatusCode()) { + int status = responseContext.getStatus(); + if (status == Response.Status.OK.getStatusCode() || + status == Response.Status.CREATED.getStatusCode() || + status == Response.Status.NO_CONTENT.getStatusCode()) { titanDao.commit(); log.debug("Doing commit from filter"); } else { diff --git a/catalog-be/src/main/webapp/WEB-INF/web.xml b/catalog-be/src/main/webapp/WEB-INF/web.xml index 93c5194c0c..027601b952 100644 --- a/catalog-be/src/main/webapp/WEB-INF/web.xml +++ b/catalog-be/src/main/webapp/WEB-INF/web.xml @@ -148,14 +148,6 @@ <load-on-startup>2</load-on-startup> </servlet> - <!-- ECOMP Portal --> - <servlet> - <servlet-name>ECOMPServlet</servlet-name> - <servlet-class>org.onap.portalsdk.core.onboarding.crossapi.PortalRestAPIProxy</servlet-class> - <load-on-startup>3</load-on-startup> - <async-supported>true</async-supported> - </servlet> - <servlet> <servlet-name>ViewStatusMessages</servlet-name> <servlet-class>ch.qos.logback.classic.ViewStatusMessagesServlet</servlet-class> @@ -167,25 +159,6 @@ <url-pattern>/lbClassicStatus</url-pattern> </servlet-mapping> -<!-- <filter> - <filter-name>GzipFilter</filter-name> - <filter-class>org.eclipse.jetty.servlets.GzipFilter</filter-class> - <async-supported>true</async-supported> - <init-param> - <param-name>methods</param-name> - <param-value>GET,POST,PUT,DELETE</param-value> - </init-param> - <init-param> - <param-name>mimeTypes</param-name> - <param-value>text/html,text/plain,text/css,application/javascript,application/json</param-value> - </init-param> - </filter> - <filter-mapping> - <filter-name>GzipFilter</filter-name> - <url-pattern>/sdc2/rest/*</url-pattern> - </filter-mapping> ---> - <context-param> <param-name>contextConfigLocation</param-name> <param-value>classpath:application-context.xml</param-value> |