sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- actually we don't want a shared_ptr as the resultset could be handled in a pool

Browse source
This commit is contained in:
kunitoki 2013-03-06 13:27:00 +01:00
parent 02fa32ba5e
commit c7139a55a7
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
plugins/input/occi/occi_featureset.cpp
View file

@ -61,7 +61,8 @@ occi_featureset::occi_featureset(StatelessConnectionPool* pool,
bool use_connection_pool,
bool use_wkb,
unsigned prefetch_rows)
: tr_(new transcoder(encoding)),
: rs_(NULL),
tr_(new transcoder(encoding)),
feature_id_(1),
ctx_(ctx),
use_wkb_(use_wkb)
@ -77,11 +78,13 @@ occi_featureset::occi_featureset(StatelessConnectionPool* pool,
try
{
rs_.reset(conn_.execute_query(sqlstring, prefetch_rows));
rs_ = conn_.execute_query(sqlstring, prefetch_rows);
}
catch (SQLException &ex)
{
MAPNIK_LOG_ERROR(occi) << "OCCI Plugin: error processing " << sqlstring << " : " << ex.getMessage();
rs_ = NULL;
}
}

2
plugins/input/occi/occi_featureset.hpp
View file

@ -69,7 +69,7 @@ private:
const bool is_point_geom);
occi_connection_ptr conn_;
boost::shared_ptr<oracle::occi::ResultSet> rs_;
oracle::occi::ResultSet* rs_;
boost::scoped_ptr<mapnik::transcoder> tr_;
mapnik::value_integer feature_id_;
mapnik::context_ptr ctx_;