diff --git a/open_builded.bat b/open_builded.bat new file mode 100644 index 00000000..7c4e9347 --- /dev/null +++ b/open_builded.bat @@ -0,0 +1 @@ +explorer C:\Users\dbnt\eclipse-workspace\.metadata\.plugins\org.eclipse.wst.server.core\tmp0\wtpwebapps\geoinfo_eGov_work diff --git a/src/main/java/geoinfo/main/login/LoginController.java b/src/main/java/geoinfo/main/login/LoginController.java index 6ddb3a85..d259d0a0 100644 --- a/src/main/java/geoinfo/main/login/LoginController.java +++ b/src/main/java/geoinfo/main/login/LoginController.java @@ -524,11 +524,21 @@ public class LoginController { String userId = (String)request.getSession().getAttribute("USERID"); - users.remove(userId, request.getSession()); - - RequestContextHolder.getRequestAttributes().removeAttribute(userId, RequestAttributes.SCOPE_SESSION); - - request.getSession().invalidate(); + + if( userId == null ) { + System.out.println( + "\n--------------------------------------------------------------\n" + + request.getRequestURI() + " " + " userId == null: 이미 로그아웃되어있음." + + "\n--------------------------------------------------------------\n" + + "userId:[" + "null" + "]\n" + + "\n--------------------------------------------------------------\n" + ); + mv.setViewName("/"); + } else { + users.remove(userId, request.getSession()); + RequestContextHolder.getRequestAttributes().removeAttribute(userId, RequestAttributes.SCOPE_SESSION); + request.getSession().invalidate(); + } return mv; } diff --git a/src/main/java/geoinfo/main/main/MainController.java b/src/main/java/geoinfo/main/main/MainController.java index d2e1f31a..4354f442 100644 --- a/src/main/java/geoinfo/main/main/MainController.java +++ b/src/main/java/geoinfo/main/main/MainController.java @@ -968,8 +968,11 @@ public class MainController } catch (SQLException e) { System.out.println(e.getMessage()); - if (false && !e.getMessage().contains("Already closed")) { - // "Already closed" 예외가 아닌 경우에만 처리 + if (true && e.getMessage().contains("Already closed")) { + System.out.println("Already closed"); + + } else if (true && e.getMessage().contains("Socket read timed out")) { + System.out.println("데이터베이스 연결 시간 초과"); } throw e; diff --git a/src/main/webapp/WEB-INF/lib/json-simple-1.1.1.jar b/src/main/webapp/WEB-INF/lib/json-simple-1.1.1.jar new file mode 100644 index 00000000..dfd5856d Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/json-simple-1.1.1.jar differ