diff options
| author | Thomas Watson | 2015-08-03 12:54:22 +0000 |
|---|---|---|
| committer | Thomas Watson | 2015-08-03 12:54:22 +0000 |
| commit | 873220b4e2036c6a232753117a41413a6df4d083 (patch) | |
| tree | 797c7f45d45d6a5b56cadfe0389a4d96eb2a488b /bundles | |
| parent | 893f80e6dce701b7329372d975e81e5c7d68566d (diff) | |
| download | rt.equinox.bundles-873220b4e2036c6a232753117a41413a6df4d083.tar.gz rt.equinox.bundles-873220b4e2036c6a232753117a41413a6df4d083.tar.xz rt.equinox.bundles-873220b4e2036c6a232753117a41413a6df4d083.zip | |
Bug 472479 - [http whiteboard] Proxy servlet not properly initialized.I20150805-2000I20150805-0800I20150804-2000I20150804-0800I20150803-2000
httpServiceRuntimeImpl is null
Diffstat (limited to 'bundles')
| -rw-r--r-- | bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/Activator.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/Activator.java b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/Activator.java index a0fe1f4c8..e4ecd0586 100644 --- a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/Activator.java +++ b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/Activator.java @@ -201,8 +201,12 @@ public class Activator String contextPath = servletContext.getContextPath(); - ServletRegistration servletRegistration = - servletContext.getServletRegistration(servletName); + ServletRegistration servletRegistration = null; + try { + servletRegistration = servletContext.getServletRegistration(servletName); + } catch (UnsupportedOperationException e) { + servletContext.log("Could not find the servlet registration for the servlet: " + servletName, e); //$NON-NLS-1$ + } if (servletRegistration == null) { return new String[0]; |