Skip to content

Fix 257: Table: Unit test regression in batchLotsOfInsertsWorks #32

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 5 commits into from
Apr 4, 2012
Merged

Fix 257: Table: Unit test regression in batchLotsOfInsertsWorks #32

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c372a00
Fix #257
jcookems Mar 8, 2012
76f6253
Merge branch 'fix257' of github.com:jcookems/azure-sdk-for-java into …
jcookems Apr 3, 2012
90442d2
Address root cause of the issue: the default response EntityInputStre…
jcookems Apr 4, 2012
bbf8b07
Minor name changes.
jcookems Apr 4, 2012
b006f17
Merge branch 'dev-bookmark' of github.com:WindowsAzure/azure-sdk-for-…
jcookems Apr 4, 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
18 changes: 16 additions & 2 deletions ...rc/main/java/com/microsoft/windowsazure/services/table/implementation/TableRestProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@
import com.sun.jersey.api.client.WebResource;
import com.sun.jersey.api.client.WebResource.Builder;
import com.sun.jersey.core.header.InBoundHeaders;
import com.sun.jersey.core.util.ReaderWriter;

public class TableRestProxy implements TableContract {
private static final String API_VERSION = "2011-08-18";
Expand Down Expand Up @@ -662,7 +663,13 @@ public BatchResult batch(BatchOperations operations, TableServiceOptions options
ThrowIfError(response);

BatchResult result = new BatchResult();
result.setEntries(parseBatchResponse(response, operations));

try {
result.setEntries(parseBatchResponse(response, operations));
}
catch (IOException e) {
throw new ServiceException(e);
}

return result;
}
Expand Down Expand Up @@ -781,7 +788,14 @@ private DataSource createBatchDeleteEntityPart(String table, String partitionKey
return bodyPartContent;
}

private List<Entry> parseBatchResponse(ClientResponse response, BatchOperations operations) {
private List<Entry> parseBatchResponse(ClientResponse response, BatchOperations operations) throws IOException {
// Default stream cannot be reset, but it is needed by multiple parts of this method.
// Replace the default response stream with one that can be read multiple times.
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
InputStream inputStream = response.getEntityInputStream();
ReaderWriter.writeTo(inputStream, byteArrayOutputStream);
response.setEntityInputStream(new ByteArrayInputStream(byteArrayOutputStream.toByteArray()));

List<DataSource> parts = mimeReaderWriter.parseParts(response.getEntityInputStream(), response.getHeaders()

@gcheng gcheng Apr 4, 2012

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the indentation of this line appear to be incorrect, I believe the team uses 4 character soft tab.

@jcookems jcookems Apr 4, 2012

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I saw what you were talking about, then I couldn't repo the issue. Might be a browser rendering issue.
Regardless, I've verified there are not tabs in the code.

.getFirst("Content-Type"));

Expand Down