MonetDB: geo - some throws changed to createException

[Foteini Alvanaki]

Changeset: b7600a8dfea6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b7600a8dfea6
Modified Files:
        geom/monetdb5/geom.c
Branch: geo
Log Message:

some throws changed to createException


diffs (33 lines):

diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -1341,12 +1341,12 @@ str wkbEnvelopeFromCoordinates(wkb** out
 
        if(linearRingGeometry == NULL) {
                //Gives segmentation fault GEOSCoordSeq_destroy(coordSeq);
-               throw(MAL, "geom.MakeEnvelope", "Error creating LinearRing from 
coordinates");
+               return createException(MAL, "geom.MakeEnvelope", "Error 
creating LinearRing from coordinates");
        }
        geosGeometry = GEOSGeom_createPolygon(linearRingGeometry, NULL, 0);
        if(geosGeometry == NULL) {
                GEOSGeom_destroy(linearRingGeometry);
-               throw(MAL, "geom.MakeEnvelope", "Error creating Polygon from 
LinearRing");
+               return createException(MAL, "geom.MakeEnvelope", "Error 
creating Polygon from LinearRing");
        }
        GEOSSetSRID(geosGeometry, *srid);
 
@@ -2150,11 +2150,11 @@ str wkbOverlaps(bit *out, wkb **geomWKB_
        *out = bit_nil;
 
        if(res == 4)
-               throw(MAL, "geom.Overlaps", "Geometries of different SRID");
+               return createException(MAL, "geom.Overlaps", "Geometries of 
different SRID");
        if(res == 3)
-               throw(MAL, "geom.Overlaps", "wkb2geos failed");
+               return createException(MAL, "geom.Overlaps", "wkb2geos failed");
        if(res == 2)
-               throw(MAL, "geom.Overlaps", "GEOSOverlaps failed");
+               return createException(MAL, "geom.Overlaps", "GEOSOverlaps 
failed");
        *out = res;
 
        return MAL_SUCCEED;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list