diff options
-rw-r--r-- | OpenSim/Framework/WebUtil.cs | 16 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs | 3 |
2 files changed, 19 insertions, 0 deletions
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs index cd93f71..511d660 100644 --- a/OpenSim/Framework/WebUtil.cs +++ b/OpenSim/Framework/WebUtil.cs | |||
@@ -940,6 +940,8 @@ namespace OpenSim.Framework | |||
940 | WebRequest request = WebRequest.Create(requestUrl); | 940 | WebRequest request = WebRequest.Create(requestUrl); |
941 | request.Method = verb; | 941 | request.Method = verb; |
942 | 942 | ||
943 | m_log.DebugFormat("[XXX] 1"); | ||
944 | |||
943 | if ((verb == "POST") || (verb == "PUT")) | 945 | if ((verb == "POST") || (verb == "PUT")) |
944 | { | 946 | { |
945 | request.ContentType = "text/xml"; | 947 | request.ContentType = "text/xml"; |
@@ -959,11 +961,14 @@ namespace OpenSim.Framework | |||
959 | int length = (int)buffer.Length; | 961 | int length = (int)buffer.Length; |
960 | request.ContentLength = length; | 962 | request.ContentLength = length; |
961 | 963 | ||
964 | m_log.DebugFormat("[XXX] 2"); | ||
962 | Stream requestStream = null; | 965 | Stream requestStream = null; |
963 | try | 966 | try |
964 | { | 967 | { |
965 | requestStream = request.GetRequestStream(); | 968 | requestStream = request.GetRequestStream(); |
966 | requestStream.Write(buffer.ToArray(), 0, length); | 969 | requestStream.Write(buffer.ToArray(), 0, length); |
970 | m_log.DebugFormat("[XXX] Wrote to stream ok"); | ||
971 | |||
967 | } | 972 | } |
968 | catch (Exception e) | 973 | catch (Exception e) |
969 | { | 974 | { |
@@ -977,6 +982,8 @@ namespace OpenSim.Framework | |||
977 | } | 982 | } |
978 | } | 983 | } |
979 | 984 | ||
985 | m_log.DebugFormat("[XXX] Getting response now... {0}", requestUrl); | ||
986 | |||
980 | try | 987 | try |
981 | { | 988 | { |
982 | using (WebResponse resp = request.GetResponse()) | 989 | using (WebResponse resp = request.GetResponse()) |
@@ -988,6 +995,9 @@ namespace OpenSim.Framework | |||
988 | deserial = (TResponse)deserializer.Deserialize(respStream); | 995 | deserial = (TResponse)deserializer.Deserialize(respStream); |
989 | respStream.Close(); | 996 | respStream.Close(); |
990 | } | 997 | } |
998 | else | ||
999 | m_log.DebugFormat("[SynchronousRestObjectRequester]: Oops! no content found in response stream from {0} {1}", requestUrl, verb); | ||
1000 | |||
991 | } | 1001 | } |
992 | } | 1002 | } |
993 | catch (System.InvalidOperationException) | 1003 | catch (System.InvalidOperationException) |
@@ -995,6 +1005,12 @@ namespace OpenSim.Framework | |||
995 | // This is what happens when there is invalid XML | 1005 | // This is what happens when there is invalid XML |
996 | m_log.WarnFormat("[SynchronousRestObjectRequester]: Invalid XML {0} {1}", requestUrl, typeof(TResponse).ToString()); | 1006 | m_log.WarnFormat("[SynchronousRestObjectRequester]: Invalid XML {0} {1}", requestUrl, typeof(TResponse).ToString()); |
997 | } | 1007 | } |
1008 | catch (Exception e) | ||
1009 | { | ||
1010 | m_log.WarnFormat("[SynchronousRestObjectRequester]: Exception on response from {0} {1}", requestUrl, e); | ||
1011 | } | ||
1012 | |||
1013 | m_log.DebugFormat("[XXX] reply is null? {0}", (deserial == null) ? "yes": "no"); | ||
998 | return deserial; | 1014 | return deserial; |
999 | } | 1015 | } |
1000 | } | 1016 | } |
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs index 919ea33..321b38b 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs | |||
@@ -178,6 +178,9 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
178 | List<GridInstantMessage> msglist = SynchronousRestObjectPoster.BeginPostObject<UUID, List<GridInstantMessage>>( | 178 | List<GridInstantMessage> msglist = SynchronousRestObjectPoster.BeginPostObject<UUID, List<GridInstantMessage>>( |
179 | "POST", m_RestURL + "/RetrieveMessages/", client.AgentId); | 179 | "POST", m_RestURL + "/RetrieveMessages/", client.AgentId); |
180 | 180 | ||
181 | if (msglist == null) | ||
182 | m_log.WarnFormat("[OFFLINE MESSAGING]: WARNING null message list."); | ||
183 | |||
181 | foreach (GridInstantMessage im in msglist) | 184 | foreach (GridInstantMessage im in msglist) |
182 | { | 185 | { |
183 | // client.SendInstantMessage(im); | 186 | // client.SendInstantMessage(im); |