7171917: CachedRowSetImpl.populate does not handle map properly
authorlancea
Mon, 11 Jun 2012 07:10:48 -0400
changeset 13012 c4ef809d7fca
parent 13011 a3a06390f67b
child 13013 87829cbb7fbe
child 13014 e2fe1611bb04
child 13021 72a4386f8976
7171917: CachedRowSetImpl.populate does not handle map properly Reviewed-by: joehw
jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java
--- a/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java	Sun Jun 10 10:29:27 2012 +0100
+++ b/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java	Mon Jun 11 07:10:48 2012 -0400
@@ -659,7 +659,7 @@
                  * us work with drivers that do not support
                  * getObject with a map in fairly sensible way
                  */
-                if (map == null) {
+                if (map == null || map.isEmpty()) {
                     obj = data.getObject(i);
                 } else {
                     obj = data.getObject(i, map);