fixes #1427 ArrayTypeHandler should call java.sql.Array#free().

mybatis · Jan 4, 2019 · 179d315 · 179d315
1 parent 56b91e5
commit 179d315
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/src/main/java/org/apache/ibatis/type/ArrayTypeHandler.java b/src/main/java/org/apache/ibatis/type/ArrayTypeHandler.java
@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2015 the original author or authors.
+ *    Copyright 2009-2019 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -37,20 +37,26 @@ public void setNonNullParameter(PreparedStatement ps, int i, Object parameter, J
 
   @Override
   public Object getNullableResult(ResultSet rs, String columnName) throws SQLException {
-    Array array = rs.getArray(columnName);
-    return array == null ? null : array.getArray();
+    return extractArray(rs.getArray(columnName));
   }
 
   @Override
   public Object getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
-    Array array = rs.getArray(columnIndex);
-    return array == null ? null : array.getArray();
+    return extractArray(rs.getArray(columnIndex));
   }
 
   @Override
   public Object getNullableResult(CallableStatement cs, int columnIndex) throws SQLException {
-    Array array = cs.getArray(columnIndex);
-    return array == null ? null : array.getArray();
+    return extractArray(cs.getArray(columnIndex));
+  }
+
+  protected Object extractArray(Array array) throws SQLException {
+    if (array == null) {
+      return null;
+    }
+    Object result = array.getArray();
+    array.free();
+    return result;
   }
 
 }
diff --git a/src/test/java/org/apache/ibatis/type/ArrayTypeHandlerTest.java b/src/test/java/org/apache/ibatis/type/ArrayTypeHandlerTest.java
@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2018 the original author or authors.
+ *    Copyright 2009-2019 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -46,6 +46,7 @@ public void shouldGetResultFromResultSetByName() throws Exception {
     String[] stringArray = new String[]{"a", "b"};
     when(mockArray.getArray()).thenReturn(stringArray);
     assertEquals(stringArray, TYPE_HANDLER.getResult(rs, "column"));
+    verify(mockArray).free();
   }
 
   @Override
@@ -62,6 +63,7 @@ public void shouldGetResultFromResultSetByPosition() throws Exception {
     String[] stringArray = new String[]{"a", "b"};
     when(mockArray.getArray()).thenReturn(stringArray);
     assertEquals(stringArray, TYPE_HANDLER.getResult(rs, 1));
+    verify(mockArray).free();
   }
 
   @Override
@@ -78,6 +80,7 @@ public void shouldGetResultFromCallableStatement() throws Exception {
     String[] stringArray = new String[]{"a", "b"};
     when(mockArray.getArray()).thenReturn(stringArray);
     assertEquals(stringArray, TYPE_HANDLER.getResult(cs, 1));
+    verify(mockArray).free();
   }
 
   @Override