From 5bb267d6ab4fbc3dad4b53e8f7605432b9b866fe Mon Sep 17 00:00:00 2001
From: wenshao <szujobs@hotmail.com>
Date: Tue, 20 Sep 2011 15:07:23 +0000
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85mock=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://code.alibabatech.com/svn/druid/trunk@898 b9813039-fb51-4c41-a8b9-e21c2acb5095
---
 .../com/alibaba/druid/mock/MockResultSetMetaData.java  | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/alibaba/druid/mock/MockResultSetMetaData.java b/src/main/java/com/alibaba/druid/mock/MockResultSetMetaData.java
index 74a0c8bc39..09ec776901 100644
--- a/src/main/java/com/alibaba/druid/mock/MockResultSetMetaData.java
+++ b/src/main/java/com/alibaba/druid/mock/MockResultSetMetaData.java
@@ -35,7 +35,11 @@ public class MockResultSetMetaData implements ResultSetMetaData {
     @SuppressWarnings("unchecked")
     @Override
     public <T> T unwrap(Class<T> iface) throws SQLException {
-        if (MockResultSetMetaData.class.isAssignableFrom(iface)) {
+        if (iface == null) {
+            return null;
+        }
+        
+        if (iface.isAssignableFrom(MockResultSetMetaData.class)) {
             return (T) this;
         }
         return null;
@@ -43,6 +47,10 @@ public class MockResultSetMetaData implements ResultSetMetaData {
 
     @Override
     public boolean isWrapperFor(Class<?> iface) throws SQLException {
+        if (iface == null) {
+            return false;
+        }
+        
         return MockResultSetMetaData.class.isAssignableFrom(iface);
     }