Changeset 6621

Timestamp:

09/30/15 11:56:54 (9 years ago)

Author:

davor.ostojic@oeaw.ac.at

Message:

 

File:

• vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/src/main/java/eu/clarin/cmdi/vlo/transformers/VariantsMapMarshaller.java (modified) (3 diffs)

vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/src/main/java/eu/clarin/cmdi/vlo/transformers/VariantsMapMarshaller.java

@@ -2 +2 @@
 
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
+import java.io.Reader;
 import java.io.UnsupportedEncodingException;
 import java.io.Writer;
@@ -23 +25 @@
         
     public static VariantsMap unmarshal(InputStream input)throws JAXBException{
+        Reader in = new InputStreamReader(input, StandardCharsets.ISO_8859_1);
+        
         JAXBContext jc = JAXBContext.newInstance(VariantsMap.class);
         Unmarshaller unmarshaller = jc.createUnmarshaller();
-        return (VariantsMap) unmarshaller.unmarshal(input);        
+        return (VariantsMap) unmarshaller.unmarshal(in);        
         
     }
@@ -31 +35 @@
     
     public static void marshal(VariantsMap map, OutputStream output) throws JAXBException, UnsupportedEncodingException{
-        
+        Writer out = new OutputStreamWriter(output, StandardCharsets.UTF_8);
+
         JAXBContext jc = JAXBContext.newInstance(VariantsMap.class);
-        Writer out = new OutputStreamWriter(output, "UTF8");
-        
         Marshaller marshaller = jc.createMarshaller();
         marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);