Permalink
Browse files

Merge pull request #231 from WindowsAzure/dev

Merging storage client 2.0.6.1 to master
  • Loading branch information...
2 parents 712841f + 93d4bcf commit 39347bf2ac6d29aa4093116a51d2737dd4cdd057 @jeffwilcox jeffwilcox committed Aug 3, 2013
View
2 README.md
@@ -1,4 +1,4 @@
-<h1>Windows Azure SDK for Windows 8 and .NET 4 (2.0.6.0)</h1>
+<h1>Windows Azure SDK for Windows 8 and .NET 4 (2.0.6.1)</h1>
<p>This SDK allows you to build Windows Azure applications that take advantage of
Azure scalable cloud computing resources: table and blob storage, messaging through
Service Bus, distributed caching through cache.</p>
View
1 microsoft-azure-api/Services/Storage/Lib/Common/Core/SR.cs
@@ -73,6 +73,7 @@ internal class SR
public const string MustCallEndMoveNextSegmentFirst = "EndMoveNextSegment must be called before the Current property can be accessed.";
public const string NoMoreResultsForSegmentCursor = "The segment cursor has no more results.";
public const string NotSupportedForPageBlob = "This operation is not supported for creating a PageBlob. Use other operations to create a PageBlob.";
+ public const string ODataReaderNotInCompletedState = "OData Reader state expected to be Completed state. Actual state: {0}.";
public const string PathStyleUriMissingAccountNameInformation = "Missing account name information inside path style uri. Path style uris should be of the form http://<IPAddressPlusPort>/<accountName>";
public const string RelativeAddressNotPermitted = "Address '{0}' is not an absolute address. Relative addresses are not permitted in here.";
public const string SeekTooFarError = "Attempting to seek past the end of the stream";
View
2 microsoft-azure-api/Services/Storage/Lib/Common/Shared/Protocol/Constants.cs
@@ -615,7 +615,7 @@ internal class HeaderConstants
/// <summary>
/// Specifies the value to use for UserAgent header.
/// </summary>
- public const string UserAgentProductVersion = "2.0.6.0";
+ public const string UserAgentProductVersion = "2.0.6.1";
/// <summary>
/// Master Windows Azure Storage header prefix.
View
2 microsoft-azure-api/Services/Storage/Lib/DotNet40/Properties/AssemblyInfo.cs
@@ -36,7 +36,7 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.6.0")]
+[assembly: AssemblyFileVersion("2.0.6.1")]
#if SIGN
[assembly: InternalsVisibleTo(
View
19 ...ure-api/Services/Storage/Lib/DotNet40/Table/Protocol/TableOperationHttpResponseParsers.cs
@@ -156,7 +156,7 @@ internal static IList<TableResult> TableBatchOperationPostProcess(IList<TableRes
cmd.CurrentResult.HttpStatusCode = mimePartResponseMessage.StatusCode;
string indexString = Convert.ToString(index);
-
+
// Attempt to extract index of failing entity from extended error info
if (cmd.CurrentResult.ExtendedErrorInformation != null &&
!string.IsNullOrEmpty(cmd.CurrentResult.ExtendedErrorInformation.ErrorMessage))
@@ -235,11 +235,26 @@ internal static ResultSegment<TElement> TableQueryPostProcessGeneric<TElement>(S
// Entry End => ?
reader.Read();
}
+
+ DrainODataReader(reader);
}
return retSeg;
}
+ private static void DrainODataReader(ODataReader reader)
+ {
+ if (reader.State == ODataReaderState.FeedEnd)
+ {
+ reader.Read();
+ }
+
+ if (reader.State != ODataReaderState.Completed)
+ {
+ throw new InvalidOperationException(string.Format(SR.ODataReaderNotInCompletedState, reader.State));
+ }
+ }
+
/// <summary>
/// Gets the table continuation from response.
/// </summary>
@@ -298,6 +313,8 @@ private static void ReadOdataEntity(TableResult result, TableOperation operation
}
}
}
+
+ DrainODataReader(reader);
}
}
View
2 microsoft-azure-api/Services/Storage/Lib/DotNet40/WindowsAzure.Storage.nuspec
@@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>WindowsAzure.Storage</id>
- <version>2.0.6.0</version>
+ <version>2.0.6.1</version>
<title>Windows Azure Storage</title>
<authors>Microsoft</authors>
<owners>Microsoft</owners>
View
2 microsoft-azure-api/Services/Storage/Lib/RT/Properties/AssemblyInfo.cs
@@ -26,7 +26,7 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.6.0")]
+[assembly: AssemblyFileVersion("2.0.6.1")]
[assembly: ComVisible(false)]
#if SIGN
[assembly: InternalsVisibleTo(
View
19 ...oft-azure-api/Services/Storage/Lib/RT/Table/Protocol/TableOperationHttpResponseParsers.cs
@@ -248,6 +248,8 @@ internal static Task<TableQuerySegment> TableQueryPostProcess(Stream responseStr
// Entry End => ?
reader.Read();
}
+
+ DrainODataReader(reader);
}
return retSeg;
@@ -293,12 +295,27 @@ internal static Task<ResultSegment<TElement>> TableQueryPostProcessGeneric<TElem
// Entry End => ?
reader.Read();
}
+
+ DrainODataReader(reader);
}
return retSeg;
});
}
+ private static void DrainODataReader(ODataReader reader)
+ {
+ if (reader.State == ODataReaderState.FeedEnd)
+ {
+ reader.Read();
+ }
+
+ if (reader.State != ODataReaderState.Completed)
+ {
+ throw new InvalidOperationException(string.Format(SR.ODataReaderNotInCompletedState, reader.State));
+ }
+ }
+
/// <summary>
/// Gets the table continuation from response.
/// </summary>
@@ -363,6 +380,8 @@ private static void ReadOdataEntity(TableResult result, TableOperation operation
}
}
}
+
+ DrainODataReader(reader);
}
}
View
2 microsoft-azure-api/Services/Storage/Lib/RTTable/Properties/AssemblyInfo.cs
@@ -25,5 +25,5 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.6.0")]
+[assembly: AssemblyFileVersion("2.0.6.1")]
[assembly: ComVisible(false)]
View
2 microsoft-azure-api/Services/Storage/Test/Unit/DotNet40/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.6.0")]
+[assembly: AssemblyFileVersion("2.0.6.1")]
View
2 microsoft-azure-api/Services/Storage/Test/Unit/RT/Package.appxmanifest
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Package xmlns="http://schemas.microsoft.com/appx/2010/manifest">
- <Identity Name="83df37fc-f57f-461f-9e06-b648b73b78c1" Publisher="CN=sozler" Version="1.0.0.0" />
+ <Identity Name="83df37fc-f57f-461f-9e06-b648b73b7832" Publisher="CN=WindowsAzure" Version="1.0.0.0" />
<Properties>
<DisplayName>Microsoft.WindowsAzure.Storage.Test</DisplayName>
<PublisherDisplayName>WindowsAzure</PublisherDisplayName>
View
2 microsoft-azure-api/Services/Storage/Test/Unit/RT/Properties/AssemblyInfo.cs
@@ -25,4 +25,4 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.6.0")]
+[assembly: AssemblyFileVersion("2.0.6.1")]
View
6 microsoft-azure-api/Services/Storage/Test/Unit/RT/RT.csproj
@@ -14,8 +14,8 @@
<DefaultLanguage>en-US</DefaultLanguage>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
- <PackageCertificateKeyFile>XSCL_RT_Test_TemporaryKey.pfx</PackageCertificateKeyFile>
- <PackageCertificateThumbprint>5CC5BF47C4BFDBF0308355BDAAF6D369253AE40D</PackageCertificateThumbprint>
+ <PackageCertificateKeyFile>RT_Test_TemporaryKey.pfx</PackageCertificateKeyFile>
+ <PackageCertificateThumbprint>5E96456B12159A670EAF6D01EC0DEA1921A4BB57</PackageCertificateThumbprint>
<AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -218,7 +218,7 @@
</ItemGroup>
<ItemGroup>
<None Include="MSSharedLibKey.snk" />
- <None Include="XSCL_RT_Test_TemporaryKey.snk" />
+ <None Include="RT_Test_TemporaryKey.pfx" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Lib\RT\RT.csproj">
View
BIN microsoft-azure-api/Services/Storage/Test/Unit/RT/RT_Test_TemporaryKey.pfx
Binary file not shown.
View
BIN microsoft-azure-api/Services/Storage/Test/Unit/RT/XSCL_RT_Test_TemporaryKey.snk
Binary file not shown.

0 comments on commit 39347bf

Please sign in to comment.