From: Markus Schaber <markus@schabi.de>
Date: Wed, 22 Nov 2006 10:42:17 +0000 (+0000)
Subject: java/ejb3/src/org/postgis/hibernate/GeometryType.java Added Nullpointer Fix by Norman... 
X-Git-Tag: 1.2.0~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fcf209de300902e553506bab25a918c60a11f518;p=postgis

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

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

diff --git a/ChangeLog b/ChangeLog
index 800415b4c..bd265bd91 100644
--- 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 b0f3b8393..7dad8f6bb 100644
--- 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;
 	}
 
 	/**