Changeset 6787 in josm for trunk/src/org/openstreetmap/josm/io/OsmServerReader.java

Timestamp:

2014-01-30T18:02:53+01:00 (10 years ago)

Author:

Don-vip

Message:

fix #9647 - filter invalid XML characters in changeset API responses

File:

• trunk/src/org/openstreetmap/josm/io/OsmServerReader.java (modified) (4 diffs)

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

@@ -87 +87 @@
         return getInputStreamRaw(urlStr, progressMonitor, null);
     }
-    
+
     /**
      * Open a connection to the given url and return a reader on the input stream
@@ -151 +151 @@
                     String errorHeader = activeConnection.getHeaderField("Error");
                     StringBuilder errorBody = new StringBuilder();
-                    try
-                    {
-                        InputStream i = FixEncoding(activeConnection.getErrorStream(), encoding);
+                    try {
+                        InputStream i = fixEncoding(activeConnection.getErrorStream(), encoding);
                         if (i != null) {
                             BufferedReader in = new BufferedReader(new InputStreamReader(i));
@@ -170 +169 @@
                 }
 
-                return FixEncoding(new ProgressInputStream(activeConnection, progressMonitor), encoding);
+                return fixEncoding(new ProgressInputStream(activeConnection, progressMonitor), encoding);
             } catch (OsmTransferException e) {
                 throw e;
@@ -181 +180 @@
     }
 
-    private InputStream FixEncoding(InputStream stream, String encoding) throws IOException
-    {
+    private InputStream fixEncoding(InputStream stream, String encoding) throws IOException {
         if ("gzip".equalsIgnoreCase(encoding)) {
             stream = new GZIPInputStream(stream);
-        }
-        else if ("deflate".equalsIgnoreCase(encoding)) {
+        } else if ("deflate".equalsIgnoreCase(encoding)) {
             stream = new InflaterInputStream(stream, new Inflater(true));
         }