Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-10811 - Fix character encoding issues with Enver's XML mappings when JVM encoding isn't UTF-8. 

(cherry picked from commit 77a4a95)
This commit is contained in:
Chris Cranford 2016-06-14 10:44:53 -05:00
parent b74868d658
commit b57bbdabf6
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/AdditionalJaxbMappingProducerImpl.java
View File

@ -7,15 +7,21 @@
package org.hibernate.envers.boot.internal; package org.hibernate.envers.boot.internal;
import java.io.BufferedInputStream; import java.io.BufferedInputStream;
import java.io.BufferedWriter;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.io.Writer; import java.io.Writer;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import org.dom4j.Document;
import org.dom4j.DocumentException;
import org.dom4j.io.OutputFormat;
import org.dom4j.io.XMLWriter;
import org.hibernate.HibernateException; import org.hibernate.HibernateException;
import org.hibernate.boot.jaxb.Origin; import org.hibernate.boot.jaxb.Origin;
import org.hibernate.boot.jaxb.SourceType; import org.hibernate.boot.jaxb.SourceType;
@ -28,15 +34,9 @@ import org.hibernate.boot.spi.MetadataBuildingContext;
import org.hibernate.boot.spi.MetadataImplementor; import org.hibernate.boot.spi.MetadataImplementor;
import org.hibernate.envers.configuration.internal.MappingCollector; import org.hibernate.envers.configuration.internal.MappingCollector;
import org.hibernate.service.ServiceRegistry; import org.hibernate.service.ServiceRegistry;
import org.jboss.jandex.IndexView; import org.jboss.jandex.IndexView;
import org.jboss.logging.Logger; import org.jboss.logging.Logger;
import org.dom4j.Document;
import org.dom4j.DocumentException;
import org.dom4j.io.OutputFormat;
import org.dom4j.io.XMLWriter;
/** /**
* @author Steve Ebersole * @author Steve Ebersole
*/ */
@ -77,8 +77,8 @@ public class AdditionalJaxbMappingProducerImpl implements AdditionalJaxbMappingP
// this form at least allows us to get better error messages // this form at least allows us to get better error messages
final ByteArrayOutputStream baos = new ByteArrayOutputStream(); final ByteArrayOutputStream baos = new ByteArrayOutputStream();
final Writer w = new PrintWriter( baos );
try { try {
final Writer w = new BufferedWriter( new OutputStreamWriter( baos, "UTF-8" ) );
final XMLWriter xw = new XMLWriter( w, new OutputFormat( " ", true ) ); final XMLWriter xw = new XMLWriter( w, new OutputFormat( " ", true ) );
xw.write( document ); xw.write( document );
w.flush(); w.flush();