Author: jeremias
Date: Mon Sep 5 14:12:10 2005
New Revision: 278842
URL: http://svn.apache.org/viewcvs?rev=278842&view=rev
Log:
My earlier fix didn't quite work if the protocol isn't the same between the base URI and the parameter URI.
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOURIResolver.java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOURIResolver.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOURIResolver.java?rev=278842&r1=278841&r2=278842&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOURIResolver.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOURIResolver.java Mon Sep 5 14:12:10 2005
@@ -110,9 +110,9 @@
String scheme = baseURL.getProtocol() + ":";
if (href.startsWith(scheme)) {
href = href.substring(scheme.length());
- }
- if ("file:".equals(scheme) && href.indexOf(':') >= 0) {
- href = "/" + href; //Absolute file URL doesn't have a leading slash
+ if ("file:".equals(scheme) && href.indexOf(':') >= 0) {
+ href = "/" + href; //Absolute file URL doesn't have a leading slash
+ }
}
absoluteURL = new URL(baseURL, href);
} catch (MalformedURLException mfue) {
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org