Fixed: Potential NPE in SQLRow.getString()

Author: MTrop

docs/CHANGELOG.md

@@ -3,6 +3,12 @@ SQL (C) Black Rook Software
 by Matt Tropiano et al. (see AUTHORS.txt)
 
 
+Changed in 1.2.3
+----------------
+
+- `Fixed` Potential NPE in SQLRow.getString()
+
+
 Changed in 1.2.2
 ----------------
 

src/main/java/com/blackrook/sql/SQLRow.java

@@ -487,7 +487,11 @@ else if (obj instanceof String)
 
 	private String getString(Object obj)
 	{
-		if (Utils.isArray(obj))
+		if (obj == null)
+		{
+			return null;
+		}
+		else if (Utils.isArray(obj))
 		{
 			if (Utils.getArrayType(obj) == Byte.TYPE)
 				return new String((byte[])obj);
@@ -543,7 +547,7 @@ else if (obj instanceof Blob)
 			return new String(bos.toByteArray());
 		}
 		else
-			return obj != null ? String.valueOf(obj) : null;
+			return String.valueOf(obj);
 	}
 
 	private Timestamp getTimestamp(Object obj)