java/ejb3/src/org/postgis/hibernate/GeometryType.java Added Nullpointer Fix by Norman...

git-svn-id: http://svn.osgeo.org/postgis/trunk@2531 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/ChangeLog b/ChangeLog
index 800415b4c80e2d95e198d87599661c2aa0c9b182..bd265bd91c4c7155b8066bac87086a5434037fed 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-22 Markus Schaber <schabi@logix-tt.com>
+
+       * java/ejb3/src/org/postgis/hibernate/GeometryType.java
+          Added Nullpointer Fix by Norman Barker
+
 2006-11-20 Sandro Santilli <strk@refractions.net>
 
        * utils/postgis_restore.pl (canonicalize_typename):

diff --git a/java/ejb3/src/org/postgis/hibernate/GeometryType.java b/java/ejb3/src/org/postgis/hibernate/GeometryType.java
index b0f3b839323155e8a5d807f1b151f2155e7ff23b..7dad8f6bbd3b2a555acc9ea5639c9bba55531c52 100644 (file)
--- a/java/ejb3/src/org/postgis/hibernate/GeometryType.java
+++ b/java/ejb3/src/org/postgis/hibernate/GeometryType.java
@@ -86,11 +86,13 @@ public class GeometryType implements UserType {
         */
        public Object nullSafeGet(ResultSet resultSet, 
                      String[] names, Object owner) throws HibernateException, SQLException {
-           Geometry result = null;
-           String geom = resultSet.getString(names[0]);
-           BinaryParser parser = new BinaryParser();
-           result = parser.parse(geom);
-           return result;
+        Geometry result = null;
+        String geom = resultSet.getString(names[0]);
+        if(geom != null ) {
+            BinaryParser parser = new BinaryParser();
+            result = parser.parse(geom);
+        }
+        return result;
        }
 
        /**