Changeset 10051 in josm for trunk/src/org

Timestamp:

2016-03-26T21:49:06+01:00 (9 years ago)

Author:

Don-vip

Message:

fix #12675 - fix XML encoding of user names in changeset requests

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• OsmApi.java (modified) (2 diffs)
• OsmWriter.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/io/OsmApi.java

@@ -281 +281 @@
      * @return XML string
      */
-    private String toXml(IPrimitive o, boolean addBody) {
+    protected final String toXml(IPrimitive o, boolean addBody) {
         StringWriter swriter = new StringWriter();
         try (OsmWriter osmWriter = OsmWriterFactory.createOsmWriter(new PrintWriter(swriter), true, version)) {
@@ -302 +302 @@
      * @return XML string
      */
-    private String toXml(Changeset s) {
+    protected final String toXml(Changeset s) {
         StringWriter swriter = new StringWriter();
         try (OsmWriter osmWriter = OsmWriterFactory.createOsmWriter(new PrintWriter(swriter), true, version)) {

trunk/src/org/openstreetmap/josm/io/OsmWriter.java

@@ -239 +239 @@
 
     public void visit(Changeset cs) {
-        out.print("  <changeset ");
-        out.print(" id='"+cs.getId()+'\'');
+        out.print("  <changeset id='"+cs.getId()+'\'');
         if (cs.getUser() != null) {
-            out.print(" user='"+cs.getUser().getName() +'\'');
+            out.print(" user='"+ XmlWriter.encode(cs.getUser().getName()) +'\'');
             out.print(" uid='"+cs.getUser().getId() +'\'');
         }