Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-17 10:41:06 +01:00
Code Issues Packages Projects Releases Activity

use reader instead of xmlsource to read configuration entry stores

Browse Source
This commit is contained in:
Sebastian Sdorra
2013-06-20 18:33:24 +02:00
parent 18c1c5ed01
commit a504ddf543
1 changed files with 36 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
scm-dao-xml/src/main/java/sonia/scm/store/JAXBConfigurationEntryStore.java
View File

@@ -30,10 +30,12 @@
*/
package sonia.scm.store;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.Charsets;
import com.google.common.base.Predicate;
import com.google.common.collect.Collections2;
import com.google.common.collect.Maps;
@@ -47,7 +49,13 @@ import sonia.scm.xml.IndentXMLStreamWriter;
//~--- JDK imports ------------------------------------------------------------
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.Reader;
import java.io.Writer;
import java.util.Collection;
import java.util.Collections;
@@ -65,7 +73,6 @@ import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
import javax.xml.transform.stream.StreamSource;
/**
*
@@ -294,6 +301,32 @@ public class JAXBConfigurationEntryStore<V>
}
}
/**
* Method description
*
*
* @return
*
* @throws FileNotFoundException
*/
private Reader createReader() throws FileNotFoundException
{
return new InputStreamReader(new FileInputStream(file), Charsets.UTF_8);
}
/**
* Method description
*
*
* @return
*
* @throws FileNotFoundException
*/
private Writer createWriter() throws FileNotFoundException
{
return new OutputStreamWriter(new FileOutputStream(file), Charsets.UTF_8);
}
/**
* Method description
*
@@ -312,7 +345,7 @@ public class JAXBConfigurationEntryStore<V>
{
Unmarshaller u = context.createUnmarshaller();
reader = xmlInputFactory.createXMLStreamReader(new StreamSource(file));
reader = xmlInputFactory.createXMLStreamReader(createReader());
reader.nextTag();
reader.nextTag();
@@ -357,7 +390,7 @@ public class JAXBConfigurationEntryStore<V>
//J-
writer = new IndentXMLStreamWriter(
XMLOutputFactory.newFactory().createXMLStreamWriter(
new FileOutputStream(file)
createWriter()
)
);
//J+