Skip to content

Fix227 224 251 #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jcookems merged 2 commits into from
Mar 29, 2012
+11 −2
Merged

Fix227 224 251 #29

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f239a50
Fix #227, #244, and #251
jcookems Mar 8, 2012
1782b84
Make fix suggested in code review feedback.
jcookems Mar 29, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions .../main/java/com/microsoft/windowsazure/services/table/implementation/AtomReaderWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,9 @@ public void write(XMLStreamWriter writer) throws XMLStreamException {
if (value != null) {
writer.writeCharacters(value);
}
else {
writer.writeAttribute("m:null", "true");
}

writer.writeEndElement(); // property name

Expand Down Expand Up @@ -276,12 +279,18 @@ private Map<String, Property> parseEntryProperties(XMLStreamReader xmlr) throws
String edmType = xmlr.getAttributeValue(null, "type");

xmlr.next();
String serializedValue = xmlr.getText();

// Use concatenation instead of StringBuilder as most text is just one element.
String serializedValue = "";
while (!xmlr.isEndElement()) {
serializedValue += xmlr.getText();
xmlr.next();
}

Object value = edmValueConverter.deserialize(edmType, serializedValue);

result.put(name, new Property().setEdmType(edmType).setValue(value));

nextSignificant(xmlr);
expect(xmlr, XMLStreamConstants.END_ELEMENT, name);
}

Expand Down