diff options
| author | Thomas Watson | 2015-02-25 14:27:34 +0000 |
|---|---|---|
| committer | Thomas Watson | 2015-02-25 14:39:51 +0000 |
| commit | fb94c385541ef9f1620bfaf3b43bde4f7cc82551 (patch) | |
| tree | 206e24c4f715a6b302cccb4588e80fce8ab17a7e | |
| parent | 558f9bfb83cd91250e9267062eb726e523c52950 (diff) | |
| download | rt.equinox.bundles-fb94c385541ef9f1620bfaf3b43bde4f7cc82551.tar.gz rt.equinox.bundles-fb94c385541ef9f1620bfaf3b43bde4f7cc82551.tar.xz rt.equinox.bundles-fb94c385541ef9f1620bfaf3b43bde4f7cc82551.zip | |
Bug 460805 - [http whiteboard] update to the latest APIs
4 files changed, 0 insertions, 5 deletions
diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/ServletTest.java b/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/ServletTest.java index 38a325c7d..c092f0f45 100644 --- a/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/ServletTest.java +++ b/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/ServletTest.java @@ -556,7 +556,6 @@ public class ServletTest extends TestCase { ServletContextDTO servletContextDTO = servletContextDTOs[0]; - Assert.assertNotNull(servletContextDTO.contextName); Assert.assertNotNull(servletContextDTO.name); } finally { @@ -949,7 +948,6 @@ public class ServletTest extends TestCase { ServletContextDTO servletContextDTO = servletContextDTOs[0]; - Assert.assertNotNull(servletContextDTO.contextName); } finally { uninstallBundle(bundle); } diff --git a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/HttpServiceRuntimeImpl.java b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/HttpServiceRuntimeImpl.java index ad56010bb..3fb46fdfa 100644 --- a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/HttpServiceRuntimeImpl.java +++ b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/HttpServiceRuntimeImpl.java @@ -1032,7 +1032,6 @@ public class HttpServiceRuntimeImpl FailedServletContextDTO failedServletContextDTO = new FailedServletContextDTO(); failedServletContextDTO.attributes = Collections.emptyMap(); - failedServletContextDTO.contextName = contextName; failedServletContextDTO.contextPath = contextPath; failedServletContextDTO.errorPageDTOs = new ErrorPageDTO[0]; failedServletContextDTO.failureReason = failureReason; diff --git a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/context/ContextController.java b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/context/ContextController.java index d3933a03e..bd1012522 100644 --- a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/context/ContextController.java +++ b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/context/ContextController.java @@ -723,7 +723,6 @@ public class ContextController { ServletContext servletContext = getProxyContext().getServletContext(); servletContextDTO.attributes = getAttributes(servletContext); - servletContextDTO.contextName = getContextName(); servletContextDTO.contextPath = getContextPath(); servletContextDTO.initParams = initParams; servletContextDTO.name = getContextName(); diff --git a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/util/DTOUtil.java b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/util/DTOUtil.java index 571505d9c..95c91af50 100644 --- a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/util/DTOUtil.java +++ b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/util/DTOUtil.java @@ -77,7 +77,6 @@ public class DTOUtil { FailedServletContextDTO clone = new FailedServletContextDTO(); clone.attributes = original.attributes; - clone.contextName = original.contextName; clone.contextPath = original.contextPath; clone.errorPageDTOs = original.errorPageDTOs; clone.failureReason = original.failureReason; |