API and JavaDoc changes for Spatial Datatypes

src/main/java/com/microsoft/sqlserver/jdbc/Geography.java

@@ -5,8 +5,10 @@
 
 package com.microsoft.sqlserver.jdbc;
 
+import java.nio.BufferUnderflowException;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
+import java.text.MessageFormat;
 
 
 public class Geography extends SQLServerSpatialDatatype {
@@ -49,8 +51,14 @@ private Geography(byte[] wkb) throws SQLServerException {
         buffer = ByteBuffer.wrap(wkb);
         buffer.order(ByteOrder.LITTLE_ENDIAN);
 
-        parseWkb();
-
+        try {
+            parseWkb();
+        } catch (NegativeArraySizeException | BufferUnderflowException | OutOfMemoryError e) {
+            MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_ParsingError"));
+            Object[] msgArgs = {JDBCType.VARBINARY};
+            throw new SQLServerException(this, form.format(msgArgs), null, 0, false);
+        }
+
         WKTsb = new StringBuffer();
         WKTsbNoZM = new StringBuffer();
 

src/main/java/com/microsoft/sqlserver/jdbc/Geometry.java

@@ -5,8 +5,10 @@
 
 package com.microsoft.sqlserver.jdbc;
 
+import java.nio.BufferUnderflowException;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
+import java.text.MessageFormat;
 
 
 public class Geometry extends SQLServerSpatialDatatype {
@@ -49,7 +51,13 @@ private Geometry(byte[] wkb) throws SQLServerException {
         buffer = ByteBuffer.wrap(wkb);
         buffer.order(ByteOrder.LITTLE_ENDIAN);
 
-        parseWkb();
+        try {
+            parseWkb();
+        } catch (NegativeArraySizeException | BufferUnderflowException | OutOfMemoryError e) {
+            MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_ParsingError"));
+            Object[] msgArgs = {JDBCType.VARBINARY};
+            throw new SQLServerException(this, form.format(msgArgs), null, 0, false);
+        }
 
         WKTsb = new StringBuffer();
         WKTsbNoZM = new StringBuffer();

src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPreparedStatement.java

@@ -2010,7 +2010,8 @@ public int[] executeBatch() throws SQLServerException, BatchUpdateException, SQL
         } catch (SQLException e) {
             // throw a BatchUpdateException with the given error message, and return null for the updateCounts.
             throw new BatchUpdateException(e.getMessage(), null, 0, null);
-        } catch (IllegalArgumentException e) {
+        }
+        catch (IllegalArgumentException | StringIndexOutOfBoundsException e) {
             // If we fail with IllegalArgumentException, fall back to the original batch insert logic.
             if (getStatementLogger().isLoggable(java.util.logging.Level.FINE)) {
                 getStatementLogger().fine("Parsing user's Batch Insert SQL Query failed: " + e.toString());
@@ -2154,7 +2155,8 @@ public long[] executeLargeBatch() throws SQLServerException, BatchUpdateExceptio
         } catch (SQLException e) {
             // throw a BatchUpdateException with the given error message, and return null for the updateCounts.
             throw new BatchUpdateException(e.getMessage(), null, 0, null);
-        } catch (IllegalArgumentException e) {
+        }
+        catch (IllegalArgumentException | StringIndexOutOfBoundsException e) {
             // If we fail with IllegalArgumentException, fall back to the original batch insert logic.
             if (getStatementLogger().isLoggable(java.util.logging.Level.FINE)) {
                 getStatementLogger().fine("Parsing user's Batch Insert SQL Query failed: " + e.toString());

src/main/java/com/microsoft/sqlserver/jdbc/SQLServerSpatialDatatype.java

@@ -1662,14 +1662,30 @@ class Figure {
         this.pointOffset = pointOffset;
     }
 
+    /**
+     * Returns the figuresAttribute value.
+     * 
+     * @return byte figuresAttribute value.
+     */
     public byte getFiguresAttribute() {
         return figuresAttribute;
     }
 
+    /**
+     * Returns the pointOffset value.
+     * 
+     * @return int pointOffset value.
+     */
     public int getPointOffset() {
         return pointOffset;
     }
 
+    /**
+     * Sets the figuresAttribute value.
+     * 
+     * @param fa
+     *        figuresAttribute value.
+     */
     public void setFiguresAttribute(byte fa) {
         figuresAttribute = fa;
     }
@@ -1691,18 +1707,39 @@ class Shape {
         this.openGISType = openGISType;
     }
 
+    /**
+     * Returns the parentOffset value.
+     * 
+     * @return int parentOffset value.
+     */
     public int getParentOffset() {
         return parentOffset;
     }
 
+    /**
+     * Returns the figureOffset value.
+     * 
+     * @return int figureOffset value.
+     */
     public int getFigureOffset() {
         return figureOffset;
     }
 
+    /**
+     * Returns the openGISType value.
+     * 
+     * @return byte openGISType value.
+     */
     public byte getOpenGISType() {
         return openGISType;
     }
 
+    /**
+     * Sets the figureOffset value.
+     * 
+     * @param fo
+     *        figureOffset value.
+     */
     public void setFigureOffset(int fo) {
         figureOffset = fo;
     }
@@ -1721,6 +1758,11 @@ class Segment {
         this.segmentType = segmentType;
     }
 
+    /**
+     * Returns the segmentType value.
+     * 
+     * @return byte segmentType value.
+     */
     public byte getSegmentType() {
         return segmentType;
     }
@@ -1744,18 +1786,38 @@ class Point {
         this.m = m;
     }
 
+    /**
+     * Returns the x coordinate value.
+     * 
+     * @return double x coordinate value.
+     */
     public double getX() {
         return x;
     }
 
+    /**
+     * Returns the y coordinate value.
+     * 
+     * @return double y coordinate value.
+     */
     public double getY() {
         return y;
     }
 
+    /**
+     * Returns the z (elevation) value.
+     * 
+     * @return double z value.
+     */
     public double getZ() {
         return z;
     }
 
+    /**
+     * Returns the m (measure) value.
+     * 
+     * @return double m value.
+     */
     public double getM() {
         return m;
     }