From 0b18171607643e532c155b40803bc6824cfe5e02 Mon Sep 17 00:00:00 2001
From: Alexander Skoblikov <alexandr.skoblikov@jkiss.org>
Date: Thu, 23 Jun 2022 13:57:35 +0300
Subject: [PATCH] CB-2131 little improvements

---
 .../src/io/cloudbeaver/server/jetty/CBJettyServer.java     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/jetty/CBJettyServer.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/jetty/CBJettyServer.java
index 306c645c6a..20db99a13b 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/jetty/CBJettyServer.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/jetty/CBJettyServer.java
@@ -16,6 +16,7 @@ import org.eclipse.jetty.servlet.ErrorPageErrorHandler;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
 import org.eclipse.jetty.servlet.ServletMapping;
+import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.runtime.DBWorkbench;
 import org.jkiss.dbeaver.utils.GeneralUtils;
@@ -75,7 +76,11 @@ public class CBJettyServer {
 
                 // Add extensions from services
                 for (DBWServiceBindingServlet wsd : WebServiceRegistry.getInstance().getWebServices(DBWServiceBindingServlet.class)) {
-                    wsd.addServlets(application, servletContextHandler);
+                    try {
+                        wsd.addServlets(application, servletContextHandler);
+                    } catch (DBException e) {
+                        log.error(e.getMessage(), e);
+                    }
                 }
 
                 initSessionManager(server, servletContextHandler);