From cc9926a173cd48666e8ae510db176af586a82e6b Mon Sep 17 00:00:00 2001
From: lancea <unknown>
Date: Mon, 11 Jun 2012 07:10:48 -0400
Subject: [PATCH] 7171917: CachedRowSetImpl.populate does not handle map
 properly Reviewed-by: joehw

---
 src/share/classes/com/sun/rowset/CachedRowSetImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/share/classes/com/sun/rowset/CachedRowSetImpl.java b/src/share/classes/com/sun/rowset/CachedRowSetImpl.java
index 6987537f2..df6cbd077 100644
--- a/src/share/classes/com/sun/rowset/CachedRowSetImpl.java
+++ b/src/share/classes/com/sun/rowset/CachedRowSetImpl.java
@@ -659,7 +659,7 @@ public class CachedRowSetImpl extends BaseRowSet implements RowSet, RowSetIntern
                  * 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);
-- 
GitLab