From 070aac18d147cd4e226dbfd13e7891b08bdc8de0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sigurd=20Lj=C3=B8dal?= <sigurd@ljodal.no>
Date: Thu, 7 Apr 2016 13:40:24 +0200
Subject: [PATCH] Fix NullPointerException in array conversion

---
 .../github/pgasync/impl/conversion/ArrayConversions.java   | 4 ++++
 .../java/com/github/pgasync/impl/ArrayConversionsTest.java | 7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/src/main/java/com/github/pgasync/impl/conversion/ArrayConversions.java b/src/main/java/com/github/pgasync/impl/conversion/ArrayConversions.java
index 40ec646..9440313 100644
--- 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
index 2ba4bb2..ff19229 100644
--- 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[][]{