balld 00/08/21 10:33:41
Modified: . changes.xml
src/org/apache/cocoon/processor/xinclude
XIncludeProcessor.java
Log:
patched xinclude processor to avoid npe on win32 systems
Revision Changes Path
1.101 +4 -1 xml-cocoon/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/xml-cocoon/changes.xml,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- changes.xml 2000/08/18 22:35:08 1.100
+++ changes.xml 2000/08/21 17:33:37 1.101
@@ -4,7 +4,7 @@
<!--
History of Cocoon changes
- $Id: changes.xml,v 1.100 2000/08/18 22:35:08 stefano Exp $
+ $Id: changes.xml,v 1.101 2000/08/21 17:33:37 balld Exp $
-->
<changes title="History of Changes">
@@ -16,6 +16,9 @@
</devs>
<release version="@version@" date="@date@">
+ <action dev="DB" type="fix" due-to="Darren Smith" due-to-email="[EMAIL
PROTECTED]">
+ Fixed a NPE in XIncludeProcessor on win32 systems
+ </action>
<action dev="SM" type="add" due-to="Juergen Sonnauer" due-to-email="[EMAIL
PROTECTED]">
Added java compiler abstraction for XSP compilation (now we can use Jikes
to improve XSP compilation speed).
</action>
1.14 +3 -3
xml-cocoon/src/org/apache/cocoon/processor/xinclude/XIncludeProcessor.java
Index: XIncludeProcessor.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/processor/xinclude/XIncludeProcessor.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- XIncludeProcessor.java 2000/08/03 17:57:27 1.13
+++ XIncludeProcessor.java 2000/08/21 17:33:40 1.14
@@ -101,7 +101,7 @@
* a terrible wasteful of memory.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Donald Ball</a>
- * @version CVS $Revision: 1.13 $ $Date: 2000/08/03 17:57:27 $ $Author:
balld $
+ * @version CVS $Revision: 1.14 $ $Date: 2000/08/21 17:33:40 $ $Author:
balld $
*/
public class XIncludeProcessor extends AbstractActor implements Processor,
Status {
@@ -206,8 +206,8 @@
this.document = document;
request = (HttpServletRequest)parameters.get("request");
monitor_key = Utils.encode(request);
- String basename = Utils.getBasename(request,context);
- current_xmlbase = new File((new File(basename)).getParent());
+ String basepath = Utils.getBasepath(request,context);
+ current_xmlbase = new File(basepath);
}
void process() throws Exception {
