diff options
| author | diva | 2009-05-15 21:11:37 +0000 |
|---|---|---|
| committer | diva | 2009-05-15 21:11:37 +0000 |
| commit | 99167c68b19128410bfd25530df62aa93cd18a20 (patch) | |
| tree | fb1c9cef5ae2abd498c6d720faf86c39df2d2b2c /OpenSim | |
| parent | * Resolve bug where save oar would never complete if any assets were missing (diff) | |
| download | opensim-SC_OLD-99167c68b19128410bfd25530df62aa93cd18a20.zip opensim-SC_OLD-99167c68b19128410bfd25530df62aa93cd18a20.tar.gz opensim-SC_OLD-99167c68b19128410bfd25530df62aa93cd18a20.tar.bz2 opensim-SC_OLD-99167c68b19128410bfd25530df62aa93cd18a20.tar.xz | |
Bug fix on POST asset so that the new asset service connector can talk to the old asset server.
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/SynchronousRestObjectRequester.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/SynchronousRestObjectRequester.cs b/OpenSim/Framework/Servers/HttpServer/SynchronousRestObjectRequester.cs index a3da709..3bb4fd5 100644 --- a/OpenSim/Framework/Servers/HttpServer/SynchronousRestObjectRequester.cs +++ b/OpenSim/Framework/Servers/HttpServer/SynchronousRestObjectRequester.cs | |||
| @@ -90,8 +90,11 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 90 | { | 90 | { |
| 91 | using (WebResponse resp = request.GetResponse()) | 91 | using (WebResponse resp = request.GetResponse()) |
| 92 | { | 92 | { |
| 93 | XmlSerializer deserializer = new XmlSerializer(typeof (TResponse)); | 93 | if (resp.ContentLength > 0) |
| 94 | deserial = (TResponse) deserializer.Deserialize(resp.GetResponseStream()); | 94 | { |
| 95 | XmlSerializer deserializer = new XmlSerializer(typeof(TResponse)); | ||
| 96 | deserial = (TResponse)deserializer.Deserialize(resp.GetResponseStream()); | ||
| 97 | } | ||
| 95 | } | 98 | } |
| 96 | } | 99 | } |
| 97 | catch (System.InvalidOperationException) | 100 | catch (System.InvalidOperationException) |