You are viewing a plain text version of this content. The canonical link for it is here.
Posted to stonehenge-commits@incubator.apache.org by be...@apache.org on 2009/10/09 04:12:59 UTC
svn commit: r823400 -
/incubator/stonehenge/trunk/stocktrader/dotnet/common/DALSQLServer/Config.cs
Author: bendewey
Date: Fri Oct 9 04:12:58 2009
New Revision: 823400
URL: http://svn.apache.org/viewvc?rev=823400&view=rev
Log:
Rolling back a version conflict from 823397 (STONEHENGE-73)
Modified:
incubator/stonehenge/trunk/stocktrader/dotnet/common/DALSQLServer/Config.cs
Modified: incubator/stonehenge/trunk/stocktrader/dotnet/common/DALSQLServer/Config.cs
URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/dotnet/common/DALSQLServer/Config.cs?rev=823400&r1=823399&r2=823400&view=diff
==============================================================================
--- incubator/stonehenge/trunk/stocktrader/dotnet/common/DALSQLServer/Config.cs (original)
+++ incubator/stonehenge/trunk/stocktrader/dotnet/common/DALSQLServer/Config.cs Fri Oct 9 04:12:58 2009
@@ -178,7 +178,7 @@
var response = new ClientConfigResponse();
response.BS = rdr.GetString(rdr.GetOrdinal("URL"));
response.BSName = rdr.GetString(rdr.GetOrdinal("BS"));
- response.Sec = rdr.GetBoolean(rdr.GetOrdinal("SEC"));
+ response.Sec = rdr["SEC"] == DBNull.Value ? false : (bool)rdr["SEC"];
rdr.Close();
@@ -205,7 +205,7 @@
var response = new BSConfigResponse();
response.OPS = rdr.GetString(rdr.GetOrdinal("URL"));
response.OPSName = rdr.GetString(rdr.GetOrdinal("OPS"));
- response.Sec = rdr.GetBoolean(rdr.GetOrdinal("SEC"));
+ response.Sec = rdr["SEC"] == DBNull.Value ? false : (bool)rdr["SEC"];
response.DBName = rdr.GetString(rdr.GetOrdinal("DBNAME"));
response.DBHostName = rdr.GetString(rdr.GetOrdinal("HOSTNAME"));
response.DBPort = rdr.GetInt32(rdr.GetOrdinal("PORT"));
@@ -306,7 +306,7 @@
bsLocations[i] = new ServiceLocation();
bsLocations[i].ServiceName = (string)rdr["SERVICENAME"];
bsLocations[i].ServiceURL = (string)rdr["URL"];
- bsLocations[i].Sec = (bool)rdr["SEC"];
+ bsLocations[i].Sec = rdr["SEC"] == DBNull.Value ? false : (bool)rdr["SEC"];
i++;
}
@@ -326,7 +326,7 @@
opsLocations[i] = new ServiceLocation();
opsLocations[i].ServiceName = (string)rdr["SERVICENAME"];
opsLocations[i].ServiceURL = (string)rdr["URL"];
- opsLocations[i].Sec = (bool)rdr["SEC"];
+ opsLocations[i].Sec = rdr["SEC"] == DBNull.Value ? false : (bool)rdr["SEC"];
i++;
}