diff options
| author | Andreas L. Delmelle <adelmelle@apache.org> | 2008-04-26 20:06:04 +0000 |
|---|---|---|
| committer | Andreas L. Delmelle <adelmelle@apache.org> | 2008-04-26 20:06:04 +0000 |
| commit | 5b92a2b32f19f208ab1313339a141efc15e35a3e (patch) | |
| tree | 48dff975384e0abd6fb71fbd1aef016da2221143 | |
| parent | 46ddb807a234655e106f4949d1474e857a025d17 (diff) | |
| download | xmlgraphics-fop-5b92a2b32f19f208ab1313339a141efc15e35a3e.tar.gz xmlgraphics-fop-5b92a2b32f19f208ab1313339a141efc15e35a3e.zip | |
Bugzilla 44203:
Fixed a logic error in Hyphenator.java where an UnsupportedOperationException was erroneously thrown if the supplied source had an associated InputStream.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@651853 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | src/java/org/apache/fop/hyphenation/Hyphenator.java | 10 | ||||
| -rw-r--r-- | status.xml | 5 |
2 files changed, 11 insertions, 4 deletions
diff --git a/src/java/org/apache/fop/hyphenation/Hyphenator.java b/src/java/org/apache/fop/hyphenation/Hyphenator.java index 3d9ef9eb8..a537a9d01 100644 --- a/src/java/org/apache/fop/hyphenation/Hyphenator.java +++ b/src/java/org/apache/fop/hyphenation/Hyphenator.java @@ -255,11 +255,13 @@ public class Hyphenator { if (source instanceof StreamSource) { in = ((StreamSource) source).getInputStream(); } - if (in == null && source.getSystemId() != null) { - in = new java.net.URL(source.getSystemId()).openStream(); - } else { - throw new UnsupportedOperationException("Cannot load hyphenation pattern file" + if (in == null) { + if (source.getSystemId() != null) { + in = new java.net.URL(source.getSystemId()).openStream(); + } else { + throw new UnsupportedOperationException("Cannot load hyphenation pattern file" + " with the supplied Source object: " + source); + } } in = new BufferedInputStream(in); try { diff --git a/status.xml b/status.xml index a289dadc9..ca4768446 100644 --- a/status.xml +++ b/status.xml @@ -57,6 +57,11 @@ <action context="Renderers" dev="AC" importance="high" type="add"> Added SVG support for AFP (GOCA). </action --> + <action context="Code" dev="AD" type="fix" fixed-bug="44203"> + Fixed a logic error in Hyphenator.java: + If the source had an associated InputStream, an UnsupportedOperationException was + triggered. + </action> <action context="Code" dev="AD" type="add" fixes-bug="44634"> Add partial support for the "show-destination" property on fo:basic-link (PDF output only; see limitations on the compliance page) |