Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2017-01-20 10:41:13 -0500
committerThomas Watson2017-01-20 10:42:26 -0500
commitd1a15a439a6771e579857a5302994ea40492580b (patch)
tree6531e7ac6766a104bcbb03e35a2123211fdc7463
parentc28dbd23898ddf1afeaa499b1f4fc82d96091203 (diff)
downloadrt.equinox.bundles-d1a15a439a6771e579857a5302994ea40492580b.tar.gz
rt.equinox.bundles-d1a15a439a6771e579857a5302994ea40492580b.tar.xz
rt.equinox.bundles-d1a15a439a6771e579857a5302994ea40492580b.zip
Bug 510746 - Test failures in official build in
equinox.http.servlet.tests: ServletTest#test_WBServlet2 Equinox DS had a bug that allowed Character types to be represented as single character strings. The specification requires the Character to be represented as an integer (seems bad for readability). The felix SCR implementation is compliant with the specification here. I converted the test to use String instead so I could keep the XML more readable instead of putting the int representation for 'b' in. Change-Id: I1982397b2c9bb2a7a42a1e6cfd8f709c629c52f8 Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>
-rw-r--r--bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/OSGI-INF/WBFilter2_component.xml2
-rw-r--r--bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/wb/t2/WBFilter2.java5
2 files changed, 4 insertions, 3 deletions
diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/OSGI-INF/WBFilter2_component.xml b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/OSGI-INF/WBFilter2_component.xml
index df5b5888..72f9ce2a 100644
--- a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/OSGI-INF/WBFilter2_component.xml
+++ b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/OSGI-INF/WBFilter2_component.xml
@@ -4,6 +4,6 @@
<service>
<provide interface="javax.servlet.Filter"/>
</service>
- <property name="char" type="Character" value="b"/>
+ <property name="char" type="String" value="b"/>
<property name="osgi.http.whiteboard.filter.pattern" type="String" value="/WBServlet2/*"/>
</scr:component>
diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/wb/t2/WBFilter2.java b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/wb/t2/WBFilter2.java
index b18f3acd..2d0011fe 100644
--- a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/wb/t2/WBFilter2.java
+++ b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/wb/t2/WBFilter2.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2014 Raymond Augé and others.
+ * Copyright (c) 2014, 2017 Raymond Augé and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -23,7 +23,8 @@ public class WBFilter2 extends AbstractWhiteboardTestFilter {
char c;
protected void activate(ComponentContext componentContext) {
- c = (Character)componentContext.getProperties().get("char");
+ String s = (String) componentContext.getProperties().get("char");
+ c = s.charAt(0);
}
@Override

Back to the top