| commit | 1d9515f5efbedf78e6845c098cc8eba6b0fefed9 | [log] [tgz] |
|---|---|---|
| author | Simon Steiner <ssteiner@apache.org> | Wed Jan 10 11:18:23 2018 +0000 |
| committer | Simon Steiner <ssteiner@apache.org> | Wed Jan 10 11:18:23 2018 +0000 |
| tree | 317ba05465602e6bf45a49774504f307d6633200 | |
| parent | 20b7b8c3c25de34c2190c463d00817090c745e95 [diff] |
BATIK-1212: Show real error on URL failure git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/batik/trunk@1820736 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/batik-svgrasterizer/src/main/java/org/apache/batik/apps/rasterizer/SVGConverter.java b/batik-svgrasterizer/src/main/java/org/apache/batik/apps/rasterizer/SVGConverter.java index 09230b4..324c3ab 100644 --- a/batik-svgrasterizer/src/main/java/org/apache/batik/apps/rasterizer/SVGConverter.java +++ b/batik-svgrasterizer/src/main/java/org/apache/batik/apps/rasterizer/SVGConverter.java
@@ -989,6 +989,7 @@ boolean proceed = controller.proceedOnSourceTranscodingFailure (inputFile, outputFile, e.getErrorCode()); if (proceed){ + e.printStackTrace(); return; } else { throw e;
diff --git a/batik-svgrasterizer/src/main/resources/org/apache/batik/apps/rasterizer/resources/Messages.properties b/batik-svgrasterizer/src/main/resources/org/apache/batik/apps/rasterizer/resources/Messages.properties index 60bdd26..1520686 100644 --- a/batik-svgrasterizer/src/main/resources/org/apache/batik/apps/rasterizer/resources/Messages.properties +++ b/batik-svgrasterizer/src/main/resources/org/apache/batik/apps/rasterizer/resources/Messages.properties
@@ -42,7 +42,7 @@ Error: cannot read source ({0}) SVGConverter.error.cannot.open.source = \ -Error: cannot open source {0} +Error: cannot open source {0} {1} SVGConverterURLSource.error.invalid.url = \ Error: invalid url ({0})
diff --git a/batik-util/src/main/java/org/apache/batik/util/ParsedURLData.java b/batik-util/src/main/java/org/apache/batik/util/ParsedURLData.java index 41a28f1..ff73f4f 100644 --- a/batik-util/src/main/java/org/apache/batik/util/ParsedURLData.java +++ b/batik-util/src/main/java/org/apache/batik/util/ParsedURLData.java
@@ -556,7 +556,11 @@ if (urlC instanceof HttpURLConnection) { // bug 49889: if available, return the error stream // (allow interpretation of content in the HTTP error response) - return (stream = ((HttpURLConnection) urlC).getErrorStream()); + stream = ((HttpURLConnection) urlC).getErrorStream(); + if (stream == null) { + throw e; + } + return stream; } else { throw e; }