Revision: 4682
          http://sourceforge.net/p/jump-pilot/code/4682
Author:   edso
Date:     2015-12-27 01:27:26 +0000 (Sun, 27 Dec 2015)
Log Message:
-----------
fix NPE in jts GeometryFactory.toGeometry(env) by ensuring env is never null

Modified Paths:
--------------
    
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/DataStoreDataSource.java

Modified: 
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/DataStoreDataSource.java
===================================================================
--- 
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/DataStoreDataSource.java
       2015-12-27 00:25:02 UTC (rev 4681)
+++ 
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/DataStoreDataSource.java
       2015-12-27 01:27:26 UTC (rev 4682)
@@ -151,7 +151,8 @@
         String[] colNames = meta.getColumnNames(query.getDatasetName());
         Envelope env = meta.getExtents(query.getDatasetName(),
             query.getGeometryAttributeName());
-        if (env != null)
+        // make sure we have a valid Envelope
+        if (env == null)
           env = new Envelope();
         query.setFilterGeometry(new GeometryFactory().toGeometry(env));
         String queryString = conn.getSqlBuilder(srid, colNames).getSQL(query);


------------------------------------------------------------------------------
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel

Reply via email to