Revert "Bug 497510 - [http]Y20170622-1000Y20170620-0625Y20170619-2325Y20170618-0415Y20170608-1000Y20170601-1000Y20170525-1000S4_7_0_RC4aS4_7_0_RC4S4_7_0_RC3S4_7_0_RC2R4_7I20170614-2000I20170613-2000I20170612-0950I20170610-0940I20170608-0530I20170607-2000I20170607-1100I20170607-0800I20170607-0215I20170606-2000I20170606-0800I20170605-2000I20170605-0800I20170604-2000I20170604-0800I20170603-1500I20170603-0800I20170603-0100I20170602-2000I20170531-2000I20170531-0800I20170530-2000I20170530-0800I20170529-2000I20170529-0800I20170528-2000I20170528-0800I20170527-1500I20170527-0800I20170526-2000I20170524-2000

HttpServletRequestWrapperImpl::getRequestUri()"

This reverts commit 3eb1d9e3c39039085c5a6298eb6be6ae12c74760.

Change-Id: I655087a9ea5beff49c3d6f3245d837f1481efee7
Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>

1 files changed, 0 insertions, 57 deletions

diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/DispatchingTest.java b/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/DispatchingTest.java
index a3711f5c9..c9a9990d2 100644
--- a/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/DispatchingTest.java
+++ b/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/DispatchingTest.java
@@ -1576,61 +1576,4 @@ public class DispatchingTest extends BaseTest {
 		Assert.assertEquals(10, counter.get());
 	}
 
-	@Test
-	public void test_Bug497510_1() throws Exception {
-		Servlet servlet = new HttpServlet() {
-			private static final long serialVersionUID = 1L;
-
-			@Override
-			protected void doGet(
-				final HttpServletRequest req, final HttpServletResponse resp)
-				throws ServletException, IOException {
-
-				String requestURI = req.getRequestURI();
-
-				Assert.assertNotNull(requestURI);
-
-				PrintWriter writer = resp.getWriter();
-				writer.write(requestURI);
-			}
-		};
-
-		Dictionary<String, Object> props = new Hashtable<String, Object>();
-		props.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_NAME, "Bug497510");
-		props.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, "/Bug497510/*");
-		registrations.add(getBundleContext().registerService(Servlet.class, servlet, props));
-
-		String result = requestAdvisor.request("Bug497510/a%20b%20c");
-
-		Assert.assertEquals("/Bug497510/a%20b%20c", result);
-	}
-
-	@Test
-	public void test_Bug497510_2() throws Exception {
-		Servlet servlet = new HttpServlet() {
-			private static final long serialVersionUID = 1L;
-
-			@Override
-			protected void doGet(
-				final HttpServletRequest req, final HttpServletResponse resp)
-				throws ServletException, IOException {
-
-				String requestURI = req.getRequestURI();
-
-				Assert.assertNotNull(requestURI);
-
-				PrintWriter writer = resp.getWriter();
-				writer.write(requestURI);
-			}
-		};
-
-		Dictionary<String, Object> props = new Hashtable<String, Object>();
-		props.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_NAME, "Bug 497510");
-		props.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, "/Bug 497510/*");
-		registrations.add(getBundleContext().registerService(Servlet.class, servlet, props));
-
-		String result = requestAdvisor.request("Bug%20497510/a%20b%20c");
-
-		Assert.assertEquals("/Bug%20497510/a%20b%20c", result);
-	}
 }
\ No newline at end of file