aboutsummaryrefslogtreecommitdiffstats
path: root/src/java/org/apache/fop/apps
diff options
context:
space:
mode:
authorJeremias Maerki <jeremias@apache.org>2011-02-10 14:09:42 +0000
committerJeremias Maerki <jeremias@apache.org>2011-02-10 14:09:42 +0000
commitdf68e0c99457e88e53bb6a434487712902ff382d (patch)
tree919f2e9441c2c188e98ab52a2b1144f7562d5941 /src/java/org/apache/fop/apps
parentb190db6910a3e133d8c1696b4730d77383f98c92 (diff)
parentf1269cc280b846cd6da396177bc74c4c9808579e (diff)
downloadxmlgraphics-fop-df68e0c99457e88e53bb6a434487712902ff382d.tar.gz
xmlgraphics-fop-df68e0c99457e88e53bb6a434487712902ff382d.zip
Merge from Trunk, revisions 1060235 to 1069383.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_Color@1069397 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org/apache/fop/apps')
-rw-r--r--src/java/org/apache/fop/apps/FopFactoryConfigurator.java10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/java/org/apache/fop/apps/FopFactoryConfigurator.java b/src/java/org/apache/fop/apps/FopFactoryConfigurator.java
index 9de00cd85..9097f23e3 100644
--- a/src/java/org/apache/fop/apps/FopFactoryConfigurator.java
+++ b/src/java/org/apache/fop/apps/FopFactoryConfigurator.java
@@ -378,15 +378,9 @@ public class FopFactoryConfigurator {
private void setBaseURI() throws FOPException {
String loc = cfg.getLocation();
- String[] locationParts = (loc != null ? cfg.getLocation().split(":") : null);
try {
- if (locationParts != null && locationParts.length >= 2
- && "file".equals(locationParts[0])) {
- StringBuilder sb = new StringBuilder(locationParts[1]);
- for (int idx = 2; idx < locationParts.length; idx++) {
- sb.append(":").append(locationParts[idx]);
- }
- baseURI = new URI(locationParts[0], sb.toString(), null);
+ if (loc != null && loc.startsWith("file:")) {
+ baseURI = new URI(loc);
baseURI = baseURI.resolve(".").normalize();
}
if (baseURI == null) {