Skip to content

Commit 7b4a09b

Browse files
committed
FELIX-6813 Revert escaping introduced via FELIX-6757
Escaping is already done in JSONWriter.quote when emitting the bundle properties as JSON. When emitting as text (via BundlesServlet.print(...) no escaping is necessary at all.
1 parent 60bd13b commit 7b4a09b

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundlesServlet.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@
7777
import org.osgi.service.packageadmin.PackageAdmin;
7878
import org.osgi.util.tracker.ServiceTracker;
7979
import org.osgi.util.tracker.ServiceTrackerCustomizer;
80-
import org.owasp.encoder.Encode;
8180

8281
import jakarta.servlet.ServletException;
8382
import jakarta.servlet.http.HttpServletRequest;
@@ -764,7 +763,7 @@ private void keyVal(final List<Map<String, Object>> props, final String key, fin
764763
final Map<String, Object> obj = new LinkedHashMap<String, Object>();
765764
obj.put("key", key);
766765
if ( val instanceof String ) {
767-
obj.put("value", Encode.forJavaScript((String)val));
766+
obj.put("value", val); // escaping happens when writing into JSON via JSONWriter
768767
} else {
769768
obj.put("value", val);
770769
}

0 commit comments

Comments
 (0)