diff options
| author | Melanie Thielker | 2010-08-19 12:01:40 +0200 |
|---|---|---|
| committer | Melanie | 2010-08-19 11:45:56 +0100 |
| commit | f58a809536d318fbd788378c54776b053919ea14 (patch) | |
| tree | a23df06881ba7201bb48216cef0a907df98bdee6 /OpenSim/Data/MySQL/MySQLGenericTableHandler.cs | |
| parent | One more go at GetExternalIpOf(user). Addresses mantis #4955 and #4943. (diff) | |
| download | opensim-SC_OLD-f58a809536d318fbd788378c54776b053919ea14.zip opensim-SC_OLD-f58a809536d318fbd788378c54776b053919ea14.tar.gz opensim-SC_OLD-f58a809536d318fbd788378c54776b053919ea14.tar.bz2 opensim-SC_OLD-f58a809536d318fbd788378c54776b053919ea14.tar.xz | |
Skip conversion if fields that are null in the database. This may
uncover errors elsewhere.
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLGenericTableHandler.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs index 6cbb2ee..7c23a47 100644 --- a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs +++ b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs | |||
| @@ -148,6 +148,10 @@ namespace OpenSim.Data.MySQL | |||
| 148 | 148 | ||
| 149 | foreach (string name in m_Fields.Keys) | 149 | foreach (string name in m_Fields.Keys) |
| 150 | { | 150 | { |
| 151 | if (reader[name] is DBNull) | ||
| 152 | { | ||
| 153 | continue; | ||
| 154 | } | ||
| 151 | if (m_Fields[name].FieldType == typeof(bool)) | 155 | if (m_Fields[name].FieldType == typeof(bool)) |
| 152 | { | 156 | { |
| 153 | int v = Convert.ToInt32(reader[name]); | 157 | int v = Convert.ToInt32(reader[name]); |