From 240923fa0cba2d15fc03428a40521d76c8acf64f Mon Sep 17 00:00:00 2001
From: hangum <hangum@gmail.com>
Date: Mon, 22 Jan 2018 00:44:34 +0900
Subject: [PATCH] =?utf8?q?-=20=EC=BD=94=EB=93=9C=EB=A6=AC=ED=8C=A9?=
 =?utf8?q?=ED=86=A0=EB=A7=81=20-=20=EC=82=AC=EC=9A=A9=EC=9E=90=20=EB=94=94?=
 =?utf8?q?=EB=B9=84=20=EC=82=AD=EC=A0=9C=EC=8B=9C=20=EC=97=AC=EB=9F=AC?=
 =?utf8?q?=EA=B0=9C=20=EC=82=AD=EC=A0=9C=20=ED=96=88=EC=9D=84=EB=95=8C=20?=
 =?utf8?q?=EB=82=98=EB=8A=94=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../hangum/tadpole/engine/manager/TadpoleSQLTransactionManager.java | 1 -
 .../src/com/hangum/tadpole/engine/query/surface/BasicDBInfo.java    | 1 +
 .../com/hangum/tadpole/engine/utils/HttpSessionCollectorUtil.java   | 6 ++++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/com.hangum.tadpole.commons.sql/src/com/hangum/tadpole/engine/manager/TadpoleSQLTransactionManager.java b/com.hangum.tadpole.commons.sql/src/com/hangum/tadpole/engine/manager/TadpoleSQLTransactionManager.java
index ca2d65f33..f227c7971 100644
--- a/com.hangum.tadpole.commons.sql/src/com/hangum/tadpole/engine/manager/TadpoleSQLTransactionManager.java
+++ b/com.hangum.tadpole.commons.sql/src/com/hangum/tadpole/engine/manager/TadpoleSQLTransactionManager.java
@@ -16,7 +16,6 @@ import java.sql.Statement;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
diff --git a/com.hangum.tadpole.commons.sql/src/com/hangum/tadpole/engine/query/surface/BasicDBInfo.java b/com.hangum.tadpole.commons.sql/src/com/hangum/tadpole/engine/query/surface/BasicDBInfo.java
index e5b9403a9..bde587733 100644
--- a/com.hangum.tadpole.commons.sql/src/com/hangum/tadpole/engine/query/surface/BasicDBInfo.java
+++ b/com.hangum.tadpole.commons.sql/src/com/hangum/tadpole/engine/query/surface/BasicDBInfo.java
@@ -224,6 +224,7 @@ public abstract class BasicDBInfo implements ConnectionInterfact {
 			logger.error(mapParam.get("table") + " table column", e);
 			throw e;
 		} finally {
+			try { if(rsPrimaryKey != null) rsPrimaryKey.close(); } catch(Exception e) {}
 			try { if(rs != null) rs.close(); } catch(Exception e) {}
 			try { if(javaConn != null) javaConn.close(); } catch(Exception e) {}
 		}
diff --git a/com.hangum.tadpole.commons.sql/src/com/hangum/tadpole/engine/utils/HttpSessionCollectorUtil.java b/com.hangum.tadpole.commons.sql/src/com/hangum/tadpole/engine/utils/HttpSessionCollectorUtil.java
index 9f11a6a4e..ce4cbbbb3 100644
--- a/com.hangum.tadpole.commons.sql/src/com/hangum/tadpole/engine/utils/HttpSessionCollectorUtil.java
+++ b/com.hangum.tadpole.commons.sql/src/com/hangum/tadpole/engine/utils/HttpSessionCollectorUtil.java
@@ -9,7 +9,9 @@
  ******************************************************************************/
 package com.hangum.tadpole.engine.utils;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
@@ -142,8 +144,8 @@ class SessionLiveChecker implements Runnable {
 //			try { Thread.sleep((60 * 1000) * 1); } catch(Exception e) {};
 			
 			Map<String, Map<String, Object>> allUserSession = HttpSessionCollectorUtil.getInstance().getSessions();
-			Set<String> keys = allUserSession.keySet();
-			for(String id : keys) {
+			final List<String> listIDs = new ArrayList<String>(allUserSession.keySet());
+			for (String id : listIDs) {
 				Map<String, Object> mapUserData = allUserSession.get(id);
 				HttpSession httpSession = (HttpSession)mapUserData.get(HttpSessionCollectorUtil.COLLECT_KEY.SESSION.name());
 				Integer intTimeOut = (Integer)mapUserData.get(HttpSessionCollectorUtil.COLLECT_KEY.TIMEOUT.name());
-- 
2.11.4.GIT