diff options
| author | AliciaRaven | 2015-02-01 15:05:56 +0000 |
|---|---|---|
| committer | Diva Canto | 2015-02-01 10:29:47 -0800 |
| commit | bee3933e5757d0673b3530db5887bf3a1b436689 (patch) | |
| tree | b9a4b278156c19e53a9e65ae6e67253c6b4ad5b0 /OpenSim | |
| parent | As per advice from Singularity devs, set is_display_name_default = true in Ge... (diff) | |
| download | opensim-SC-bee3933e5757d0673b3530db5887bf3a1b436689.zip opensim-SC-bee3933e5757d0673b3530db5887bf3a1b436689.tar.gz opensim-SC-bee3933e5757d0673b3530db5887bf3a1b436689.tar.bz2 opensim-SC-bee3933e5757d0673b3530db5887bf3a1b436689.tar.xz | |
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.
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/DataSnapshot/DataSnapshotManager.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs index f7b2338..600e826 100644 --- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs +++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs | |||
| @@ -395,7 +395,7 @@ namespace OpenSim.Region.DataSnapshot | |||
| 395 | string delimStr = ";"; | 395 | string delimStr = ";"; |
| 396 | char [] delimiter = delimStr.ToCharArray(); | 396 | char [] delimiter = delimStr.ToCharArray(); |
| 397 | 397 | ||
| 398 | string[] services = servicesStr.Split(delimiter); | 398 | string[] services = servicesStr.Split(delimiter, StringSplitOptions.RemoveEmptyEntries); |
| 399 | 399 | ||
| 400 | for (int i = 0; i < services.Length; i++) | 400 | for (int i = 0; i < services.Length; i++) |
| 401 | { | 401 | { |