From e8175b24f592d9de725dbd7b5d462e5e25ed0801 Mon Sep 17 00:00:00 2001
From: wenshao <szujobs@hotmail.com>
Date: Mon, 19 Sep 2011 06:53:59 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E9=87=8D=E5=A4=8Drollback?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=9A=84=E9=97=AE=E9=A2=98?=
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@860 b9813039-fb51-4c41-a8b9-e21c2acb5095
---
 src/main/java/com/alibaba/druid/pool/PoolableConnection.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/com/alibaba/druid/pool/PoolableConnection.java b/src/main/java/com/alibaba/druid/pool/PoolableConnection.java
index 5221b28743..a47052371b 100644
--- a/src/main/java/com/alibaba/druid/pool/PoolableConnection.java
+++ b/src/main/java/com/alibaba/druid/pool/PoolableConnection.java
@@ -587,6 +587,10 @@ public class PoolableConnection implements PooledConnection, Connection {
 
     @Override
     public void rollback() throws SQLException {
+        if (transactionInfo == null) {
+            return;
+        }
+    
         checkOpen();
 
         DruidAbstractDataSource dataSource = holder.getDataSource();