From 14a3375bed6ebbcf2b456526e4a079279764ad0f Mon Sep 17 00:00:00 2001 From: AliciaRaven Date: Sun, 1 Feb 2015 15:05:56 +0000 Subject: [PATCH] Prevent null entries being treated as URI's when DataSnapshot service splits service string. The new config format for services to notify in the DataSnapshot module appends entries to the existing single string and always leaves a deliminator on the end of the string. This is causing it to split with a null string in the resulting array, which is treated as another service to notify and throws a URI format exception on start up. --- OpenSim/Region/DataSnapshot/DataSnapshotManager.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs index f7b2338612..600e826b82 100644 --- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs +++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs @@ -395,7 +395,7 @@ namespace OpenSim.Region.DataSnapshot string delimStr = ";"; char [] delimiter = delimStr.ToCharArray(); - string[] services = servicesStr.Split(delimiter); + string[] services = servicesStr.Split(delimiter, StringSplitOptions.RemoveEmptyEntries); for (int i = 0; i < services.Length; i++) {