Changeset 12937 in josm
- Timestamp:
- 2017-10-07T22:39:09+02:00 (6 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/io/protocols/data/DataConnection.java
r10931 r12937 8 8 import java.net.URLConnection; 9 9 import java.util.Base64; 10 11 import org.openstreetmap.josm.tools.bugreport.BugReport; 10 12 11 13 /** … … 32 34 @Override 33 35 public InputStream getInputStream() throws IOException { 34 return new ByteArrayInputStream(Base64.getDecoder().decode(url.toString().replaceFirst("^.*;base64,", ""))); 36 try { 37 return new ByteArrayInputStream(Base64.getDecoder().decode(url.toString().replaceFirst("^.*;base64,", ""))); 38 } catch (IllegalArgumentException e) { 39 throw BugReport.intercept(e).put("url", url); 40 } 35 41 } 36 42 } -
trunk/src/org/openstreetmap/josm/tools/ImageProvider.java
r12870 r12937 977 977 String data = m.group(3); 978 978 byte[] bytes; 979 if (";base64".equals(base64)){980 bytes = Base64.getDecoder().decode(data);981 } else {982 try{979 try { 980 if (";base64".equals(base64)) { 981 bytes = Base64.getDecoder().decode(data); 982 } else { 983 983 bytes = Utils.decodeUrl(data).getBytes(StandardCharsets.UTF_8); 984 } catch (IllegalArgumentException ex) {985 Logging.log(Logging.LEVEL_WARN, "Unable to decode URL data part: "+ex.getMessage() + " (" + data + ')', ex);986 return null;987 }984 } 985 } catch (IllegalArgumentException ex) { 986 Logging.log(Logging.LEVEL_WARN, "Unable to decode URL data part: "+ex.getMessage() + " (" + data + ')', ex); 987 return null; 988 988 } 989 989 String mediatype = m.group(1);
Note:
See TracChangeset
for help on using the changeset viewer.