Merge pull request #193 from tdcmeehan/emptysize

Fix NPE on estimateMemorySize against empty multipart geometries

Author: stolstov

src/main/java/com/esri/core/geometry/MultiPathImpl.java

@@ -66,8 +66,8 @@ public long estimateMemorySize()
 			+ (m_envelope != null ? m_envelope.estimateMemorySize() : 0)
 			+ (m_moveToPoint != null ? m_moveToPoint.estimateMemorySize() : 0)
 			+ (m_cachedRingAreas2D != null ? m_cachedRingAreas2D.estimateMemorySize() : 0)
-			+ m_paths.estimateMemorySize()
-			+ m_pathFlags.estimateMemorySize()
+			+ (m_paths != null ? m_paths.estimateMemorySize() : 0)
+			+ (m_pathFlags != null ? m_pathFlags.estimateMemorySize() : 0)
 			+ (m_segmentFlags != null ? m_segmentFlags.estimateMemorySize() : 0)
 			+ (m_segmentParamIndex != null ? m_segmentParamIndex.estimateMemorySize() : 0)
 			+ (m_segmentParams != null ? m_segmentParams.estimateMemorySize() : 0);

src/test/java/com/esri/core/geometry/TestEstimateMemorySize.java

@@ -77,36 +77,71 @@ public void testPoint() {
 		testGeometry(parseWkt("POINT (1 2)"));
 	}
 
+	@Test
+	public void testEmptyPoint() {
+		testGeometry(parseWkt("POINT EMPTY"));
+	}
+
 	@Test
 	public void testMultiPoint() {
 		testGeometry(parseWkt("MULTIPOINT (0 0, 1 1, 2 3)"));
 	}
 
+	@Test
+	public void testEmptyMultiPoint() {
+		testGeometry(parseWkt("MULTIPOINT EMPTY"));
+	}
+
 	@Test
 	public void testLineString() {
 		testGeometry(parseWkt("LINESTRING (0 1, 2 3, 4 5)"));
 	}
 
+	@Test
+	public void testEmptyLineString() {
+		testGeometry(parseWkt("LINESTRING EMPTY"));
+	}
+
 	@Test
 	public void testMultiLineString() {
 		testGeometry(parseWkt("MULTILINESTRING ((0 1, 2 3, 4 5), (1 1, 2 2))"));
 	}
 
+	@Test
+	public void testEmptyMultiLineString() {
+		testGeometry(parseWkt("MULTILINESTRING EMPTY"));
+	}
+
 	@Test
 	public void testPolygon() {
 		testGeometry(parseWkt("POLYGON ((30 10, 40 40, 20 40, 10 20, 30 10))"));
 	}
 
+	@Test
+	public void testEmptyPolygon() {
+		testGeometry(parseWkt("POLYGON EMPTY"));
+	}
+
 	@Test
 	public void testMultiPolygon() {
 		testGeometry(parseWkt("MULTIPOLYGON (((30 20, 45 40, 10 40, 30 20)), ((15 5, 40 10, 10 20, 5 10, 15 5)))"));
 	}
 
+	@Test
+	public void testEmptyMultiPolygon() {
+		testGeometry(parseWkt("MULTIPOLYGON EMPTY"));
+	}
+
 	@Test
 	public void testGeometryCollection() {
 		testGeometry(parseWkt("GEOMETRYCOLLECTION (POINT(4 6), LINESTRING(4 6,7 10))"));
 	}
 
+	@Test
+	public void testEmptyGeometryCollection() {
+		testGeometry(parseWkt("GEOMETRYCOLLECTION EMPTY"));
+	}
+
 	private void testGeometry(OGCGeometry geometry) {
 		assertTrue(geometry.estimateMemorySize() > 0);
 	}