cziegeler 01/05/31 23:19:58
Modified: src/org/apache/cocoon/transformation TraxTransformer.java
Log:
Fixes for the resolve method reported by Rob Moffat
Revision Changes Path
1.15 +6 -11
xml-cocoon2/src/org/apache/cocoon/transformation/TraxTransformer.java
Index: TraxTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/TraxTransformer.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- TraxTransformer.java 2001/05/31 17:39:01 1.14
+++ TraxTransformer.java 2001/06/01 06:19:56 1.15
@@ -100,7 +100,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Davanum Srinivas</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
- * @version CVS $Id: TraxTransformer.java,v 1.14 2001/05/31 17:39:01 bloritsch Exp $
+ * @version CVS $Id: TraxTransformer.java,v 1.15 2001/06/01 06:19:56 cziegeler Exp $
*/
public class TraxTransformer extends ContentHandlerWrapper
implements Transformer, Composable, Recyclable, Configurable, Cacheable,
Disposable, URIResolver {
@@ -259,18 +259,13 @@
// is the base a file or a real url
if (base.startsWith("file:") == false) {
- java.net.URL url = new java.net.URL(base);
- String parentPath = url.getPath();
- int lastPathElementPos = parentPath.indexOf('/');
+ int lastPathElementPos = base.lastIndexOf('/');
if (lastPathElementPos == -1) {
- xslSource = this.resolver.resolve(url.getProtocol()+ "://"
- + url.getHost()+ ":"
- + url.getPort()+ "/" + href);
+ // this should never occur as the base should
+ // always be protol:/....
+ return null; // we can't resolve this
} else {
- xslSource = this.resolver.resolve(url.getProtocol()+ "://"
- + url.getHost()+ ":"
- + url.getPort()+ "/"
- + parentPath.substring(0,
lastPathElementPos)
+ xslSource = this.resolver.resolve(base.substring(0,
lastPathElementPos)
+ "/" + href);
}
} else {
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
