mrglavas    2004/01/26 10:58:24

  Modified:    java/src/org/apache/xml/serialize DOMSerializerImpl.java
  Log:
  We need to use the EncodingMap to translate IANA to 
  Java encoding names. Set a byte stream on the serializer
  instead of trying to create an OutputStreamWriter. The
  underlying serializer will do that for us and do the 
  encoding map lookup.
  
  Revision  Changes    Path
  1.13      +5 -4      
xml-xerces/java/src/org/apache/xml/serialize/DOMSerializerImpl.java
  
  Index: DOMSerializerImpl.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xerces/java/src/org/apache/xml/serialize/DOMSerializerImpl.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- DOMSerializerImpl.java    23 Jan 2004 20:56:54 -0000      1.12
  +++ DOMSerializerImpl.java    26 Jan 2004 18:58:24 -0000      1.13
  @@ -675,7 +675,7 @@
           }
           try {
               ser.reset();
  -            serializer._format.setEncoding(encoding);
  +            ser._format.setEncoding(encoding);
               OutputStream outputStream = destination.getByteStream();
               Writer writer = destination.getCharacterStream();
               String uri =  destination.getSystemId();
  @@ -721,7 +721,7 @@
                               }
                               out = urlCon.getOutputStream();
                           }
  -                        ser.setOutputCharStream( new OutputStreamWriter(out, 
encoding) );
  +                        ser.setOutputByteStream(out);
                       }
                   }
                   else {
  @@ -855,6 +855,7 @@
   
           try {
               ser.reset();
  +            ser._format.setEncoding(encoding);
               
               // URI was specified. Handle relative URIs.
               String expanded = XMLEntityManager.expandSystemId(URI, null, true);
  @@ -885,7 +886,7 @@
                   }
                   out = urlCon.getOutputStream();
               }
  -            ser.setOutputCharStream( new OutputStreamWriter(out, encoding) );
  +            ser.setOutputByteStream(out);
   
               if (node.getNodeType() == Node.DOCUMENT_NODE)
                   ser.serialize((Document) node);
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to