# HG changeset patch
# User lancea
# Date 1339413048 14400
# Node ID c4ef809d7fcaac5e6d66c4ccca39b6a831e063f2
# Parent  a3a06390f67b63c46bcd3dc616c9a77954566223
7171917: CachedRowSetImpl.populate does not handle map properly
Reviewed-by: joehw

diff -r a3a06390f67b -r c4ef809d7fca 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);