Merge pull request alaisi#21 from ljodal/master

alaisi · alaisi · commit d5ed149ef94d · 2016-04-07T17:06:23.000+03:00
Fix NullPointerException in array conversion
diff --git a/src/main/java/com/github/pgasync/impl/conversion/ArrayConversions.java b/src/main/java/com/github/pgasync/impl/conversion/ArrayConversions.java
@@ -60,6 +60,10 @@ public static <T> T toArray(Class<T> type, Oid oid, byte[] value, BiFunction<Oid
             throw new IllegalArgumentException("Primitive arrays are not supported due to possible NULL values");
         }
 
+        if (value == null) {
+            return null;
+        }
+
         char[] text = new String(value, UTF_8).toCharArray();
         List<List<Object>> holder = new ArrayList<>(1);
 
diff --git a/src/test/java/com/github/pgasync/impl/ArrayConversionsTest.java b/src/test/java/com/github/pgasync/impl/ArrayConversionsTest.java
@@ -127,6 +127,13 @@ public void selectTimestamp() {
             getRow().getArray("TIMESTAMPA", Timestamp[].class));
     }
 
+    @Test
+    public void selectNull() {
+        dbr.query("INSERT INTO CA_TEST (TEXTA) VALUES (NULL);");
+
+        assertArrayEquals(null, getRow().getArray("TEXTA", String[].class));
+    }
+
     @Test
     public void roundtripInt() {
         Integer[][] a = new Integer[][]{

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,10 @@ public static <T> T toArray(Class<T> type, Oid oid, byte[] value, BiFunction<Oid`
`60`	`60`	`throw new IllegalArgumentException("Primitive arrays are not supported due to possible NULL values");`
`61`	`61`	`}`
`62`	`62`
	`63`	`+ if (value == null) {`
	`64`	`+ return null;`
	`65`	`+ }`
	`66`	`+`
`63`	`67`	`char[] text = new String(value, UTF_8).toCharArray();`
`64`	`68`	`List<List<Object>> holder = new ArrayList<>(1);`
`65`	`69`