cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ba...@locus.apache.org
Subject cvs commit: xml-cocoon/src/org/apache/cocoon/processor/xinclude XIncludeProcessor.java
Date Thu, 14 Sep 2000 18:48:16 GMT
balld       00/09/14 11:48:14

  Modified:    src/org/apache/cocoon/processor/xinclude
                        XIncludeProcessor.java
  Log:
  patch from Tagunov Anthony to fix importation of non-ISO-8859-1 charsets
  
  Revision  Changes    Path
  1.15      +4 -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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- XIncludeProcessor.java	2000/08/21 17:33:40	1.14
  +++ XIncludeProcessor.java	2000/09/14 18:48:12	1.15
  @@ -101,7 +101,7 @@
    * a terrible wasteful of memory.
    *
    * @author <a href="mailto:balld@webslingerZ.com">Donald Ball</a>
  - * @version CVS $Revision: 1.14 $ $Date: 2000/08/21 17:33:40 $ $Author: balld $
  + * @version CVS $Revision: 1.15 $ $Date: 2000/09/14 18:48:12 $ $Author: balld $
    */
   public class XIncludeProcessor extends AbstractActor implements Processor, Status {
   
  @@ -349,14 +349,15 @@
   			}
   		} else if (xinclude.parse.equals("xml")) {
   			InputSource input;
  -			if (content instanceof Reader) {
  +			/*if (content instanceof Reader) {
   				input = new InputSource((Reader)content);
   			} else if (content instanceof InputStream) {
   				input = new InputSource((InputStream)content);
   			} else {
   				throw new Exception("Unknown object type: "+content);
   			}
  -			input.setSystemId(system_id);
  +			input.setSystemId(system_id); */
  +			input = new InputSource(system_id);
   			Document included_document = null;
   			try {
   				included_document = parser.parse(input,false);
  
  
  

Mime
View raw message