Date: Wednesday, March 22, 2006 @ 17:31:52
  Author: marc
    Path: /cvsroot/carob/carob/src

Modified: SQLDataSerialization.cpp (1.31 -> 1.32)

Renamed nullDeserializer into undefinedDeserializer for consistency with 
sequoia code. CAROB-82.


--------------------------+
 SQLDataSerialization.cpp |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)


Index: carob/src/SQLDataSerialization.cpp
diff -u carob/src/SQLDataSerialization.cpp:1.31 
carob/src/SQLDataSerialization.cpp:1.32
--- carob/src/SQLDataSerialization.cpp:1.31     Wed Mar 22 14:26:52 2006
+++ carob/src/SQLDataSerialization.cpp  Wed Mar 22 17:31:52 2006
@@ -275,11 +275,13 @@
   return res;
 }
 
-ResultSetDataType nullDeserializer(const DriverSocket& input)
+/** This serializer is only a placeholder for the undefined type tag,
+ * it should never be called (nulls are not serialized, see
+ * DriverResultSet#receiveRows()) */
+ResultSetDataType undefinedDeserializer(const DriverSocket& input)
     throw (DriverException, UnexpectedException)
 {
-  throw DriverException(L"nullDeserializer should never be called!");
-  return (ResultSetDataType) {0};
+  throw DriverException(L"undefinedDeserializer should never be called!");
 }
 
 deserializerPtr SQLDataSerialization::getDeserializer(TypeTag ttPrm)
@@ -321,7 +323,7 @@
       return SQLTimestampDeserializer;
     break;
     case TT_UNDEFINED:
-      return nullDeserializer;
+      return undefinedDeserializer;
     break;
     case TT_BLOB:
     case TT_JAVA_SERIALIZABLE:

_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits

Reply via email to