ResultSet.getObject threw a ClassNotFoundException if the JTS suite was not in the classpath

h2/src/docsrc/html/changelog.html

@@ -20,7 +20,7 @@ Change Log
 <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
-<ul><li>-
+<ul><li>ResultSet.getObject threw a ClassNotFoundException if the JTS suite was not in the classpath.
 </li></ul>
 
 <h2>Version 1.4.193 Beta (2016-10-31)</h2>

h2/src/main/org/h2/jdbc/JdbcResultSet.java

@@ -60,8 +60,6 @@ import org.h2.value.ValueTime;
 import org.h2.value.ValueTimestamp;
 import org.h2.value.ValueTimestampTimeZone;
 
-import com.vividsolutions.jts.geom.Geometry;
-
 /**
  * <p>
  * Represents a result set.
@@ -3782,7 +3780,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet, JdbcResultS
             return type.cast(value.getBytes());
         } else if (type == TimestampWithTimeZone.class) {
             return type.cast(value.getObject());
-        } else if (type.isAssignableFrom(Geometry.class)) {
+        } else if (DataType.isGeometryClass(type)) {
             return type.cast(value.getObject());
         } else if (LocalDateTimeUtils.isLocalDate(type)) {
             return type.cast(LocalDateTimeUtils.valueToLocalDate(value));