mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-01-12 11:47:26 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix and improve last commit for data URIs

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2683 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen@gmail.com 2013-04-23 09:08:26 +00:00
parent 13d97af689
commit 57dc2ca742
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
zxingorg/src/com/google/zxing/web/DecodeServlet.java
View file

@ -123,15 +123,15 @@ public final class DecodeServlet extends HttpServlet {
imageURIString = imageURIString.trim(); imageURIString = imageURIString.trim();
if (!(imageURIString.startsWith("http://") || imageURIString.startsWith("https://"))) {
imageURIString = "http://" + imageURIString;
}
URI imageURI; URI imageURI;
try { try {
imageURI = new URI(imageURIString); imageURI = new URI(imageURIString);
} catch (URISyntaxException ignored) { // Assume http: if not specified
log.info("URI was not valid: " + imageURIString); if (imageURI.getScheme() == null) {
imageURI = new URI("http://" + imageURIString);
}
} catch (URISyntaxException urise) {
log.info("URI " + imageURIString + " was not valid: " + urise);
response.sendRedirect("badurl.jspx"); response.sendRedirect("badurl.jspx");
return; return;
} }
@ -144,8 +144,8 @@ public final class DecodeServlet extends HttpServlet {
} catch (IOException ioe) { } catch (IOException ioe) {
log.info(ioe.toString()); log.info(ioe.toString());
response.sendRedirect("badurl.jspx"); response.sendRedirect("badurl.jspx");
return;
} }
return;
} }
URL imageURL; URL imageURL;