mend

rwgdrummer · rwgdrummer · commit 13409f6e8dfe · 2015-05-14T17:06:37.000-04:00
diff --git a/extensions/adapters/vector/src/main/java/mil/nga/giat/geowave/adapter/vector/FeatureWritable.java b/extensions/adapters/vector/src/main/java/mil/nga/giat/geowave/adapter/vector/FeatureWritable.java
@@ -100,7 +100,7 @@ public void readFields(
 	public void write(
 			final DataOutput output )
 			throws IOException {
-		output.writeUTF(featureType.getName().getNamespaceURI());
+		output.writeUTF(featureType.getName().getNamespaceURI() == null ? "" : featureType.getName().getNamespaceURI());
 		output.writeUTF(featureType.getTypeName());
 		output.writeUTF(DataUtilities.encodeType(featureType));
 		output.writeUTF(FeatureDataUtils.getAxis(featureType.getCoordinateReferenceSystem()));
diff --git a/extensions/adapters/vector/src/main/java/mil/nga/giat/geowave/adapter/vector/util/FeatureDataUtils.java b/extensions/adapters/vector/src/main/java/mil/nga/giat/geowave/adapter/vector/util/FeatureDataUtils.java
@@ -98,9 +98,11 @@ public static SimpleFeatureType decodeType(
 			final String axis )
 			throws SchemaException {
 
-		SimpleFeatureType featureType = DataUtilities.createType(
+		SimpleFeatureType featureType = nameSpace != null && nameSpace.length() > 0 ? DataUtilities.createType(
 				nameSpace,
 				typeName,
+				typeDescriptor) : DataUtilities.createType(
+				typeName,
 				typeDescriptor);
 
 		final String lCaseAxis = axis.toLowerCase();
@@ -116,6 +118,7 @@ public static SimpleFeatureType decodeType(
 			try {
 				// truely no way to force lat first
 				// but it is the default in later versions of GeoTools.
+				// this all depends on the authority at the time of creation
 				featureType = SimpleFeatureTypeBuilder.retype(
 						featureType,
 						CRS.decode(
