diff options
| author | Diva Canto | 2013-05-13 11:36:17 -0700 |
|---|---|---|
| committer | Diva Canto | 2013-05-13 11:36:17 -0700 |
| commit | af1fa958756a2c76810847a2059befa071956d09 (patch) | |
| tree | 7ad1796bf130cab278959215d52f3c95af42a994 | |
| parent | Fixes mantis #6636 -- Groups (diff) | |
| download | opensim-SC-af1fa958756a2c76810847a2059befa071956d09.zip opensim-SC-af1fa958756a2c76810847a2059befa071956d09.tar.gz opensim-SC-af1fa958756a2c76810847a2059befa071956d09.tar.bz2 opensim-SC-af1fa958756a2c76810847a2059befa071956d09.tar.xz | |
Groups: Improve error handling on remote connector.
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs b/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs index f991d01..28f7acc 100644 --- a/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs +++ b/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs | |||
| @@ -170,11 +170,16 @@ namespace OpenSim.Groups | |||
| 170 | 170 | ||
| 171 | } | 171 | } |
| 172 | 172 | ||
| 173 | grec = m_GroupsService.GetGroupRecord(RequestingAgentID, grec.GroupID); | 173 | if (grec.GroupID != UUID.Zero) |
| 174 | if (grec == null) | 174 | { |
| 175 | NullResult(result, "Internal Error"); | 175 | grec = m_GroupsService.GetGroupRecord(RequestingAgentID, grec.GroupID); |
| 176 | if (grec == null) | ||
| 177 | NullResult(result, "Internal Error"); | ||
| 178 | else | ||
| 179 | result["RESULT"] = GroupsDataUtils.GroupRecord(grec); | ||
| 180 | } | ||
| 176 | else | 181 | else |
| 177 | result["RESULT"] = GroupsDataUtils.GroupRecord(grec); | 182 | NullResult(result, reason); |
| 178 | } | 183 | } |
| 179 | 184 | ||
| 180 | string xmlString = ServerUtils.BuildXmlResponse(result); | 185 | string xmlString = ServerUtils.BuildXmlResponse(result); |