MonetDB: Jan2014 - Better fix for changeset 113bc21582b0.

[Sjoerd Mullender]

Changeset: 94b904790e8a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=94b904790e8a
Modified Files:
        sql/backends/monet5/sql.c
Branch: Jan2014
Log Message:

Better fix for changeset 113bc21582b0.


diffs (22 lines):

diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -1942,13 +1942,13 @@ DELTAbat(bat *result, bat *col, bat *uid
        }
 
        c = BATdescriptor(*col);
-       if ( c ) {
-               if ((res = BATcopy(c, TYPE_void, c->ttype, TRUE)) == NULL){
-                       BBPunfix(c->batCacheid);
-                       throw(MAL, "sql.delta", OPERATION_FAILED);
-               }
+       if (c == NULL)
+               throw(MAL, "sql.delta", RUNTIME_OBJECT_MISSING);
+       if ((res = BATcopy(c, TYPE_void, c->ttype, TRUE)) == NULL){
                BBPunfix(c->batCacheid);
+               throw(MAL, "sql.delta", OPERATION_FAILED);
        }
+       BBPunfix(c->batCacheid);
 
        if ((u_val = BATdescriptor(*uval)) == NULL)
                throw(MAL, "sql.delta", RUNTIME_OBJECT_MISSING);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list