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

fix store and load method of xml configuration entry store

Browse Source
This commit is contained in:
Sebastian Sdorra
2013-09-16 11:38:17 +02:00
parent 4586d2de0b
commit 10b2221bb6
3 changed files with 209 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -343,7 +343,11 @@ public class JAXBConfigurationEntryStore<V>
Unmarshaller u = context.createUnmarshaller();
reader = xmlInputFactory.createXMLStreamReader(createReader());
// configuration
reader.nextTag();
// entry start
reader.nextTag();
while (reader.isStartElement() && reader.getLocalName().equals(TAG_ENTRY))
@@ -354,12 +358,28 @@ public class JAXBConfigurationEntryStore<V>
String key = reader.getElementText();
// read entry
// read value
reader.nextTag();
V v = (V) u.unmarshal(reader, type).getValue();
JAXBElement<V> element = u.unmarshal(reader, type);
entries.put(key, v);
if (!element.isNil())
{
V v = element.getValue();
System.out.println( "value: " + v );
entries.put(key, v);
}
else
{
logger.warn("could not unmarshall object of entry store");
}
// closed entry tag
reader.nextTag();
// start new entry
reader.nextTag();
}
}
catch (Exception ex)
@@ -392,6 +412,7 @@ public class JAXBConfigurationEntryStore<V>
);
//J+
writer.writeStartDocument();
// configuration start
writer.writeStartElement(TAG_CONFIGURATION);
Marshaller m = context.createMarshaller();
@@ -400,17 +421,24 @@ public class JAXBConfigurationEntryStore<V>
for (Entry<String, V> e : entries.entrySet())
{
// entry start
writer.writeStartElement(TAG_ENTRY);
// key start
writer.writeStartElement(TAG_KEY);
writer.writeCharacters(e.getKey());
// key end
writer.writeEndElement();
// value
JAXBElement<V> je = new JAXBElement<V>(QName.valueOf(TAG_VALUE), type,
e.getValue());
m.marshal(je, writer);
// entry end
writer.writeEndElement();
}
// configuration end
writer.writeEndElement();
writer.writeEndDocument();
}