From ad51f03cc9f7e0270063344fc2464071d6fa326e Mon Sep 17 00:00:00 2001
From: Madhu Venugopal <vmadhu@cisco.com>
Date: Tue, 14 May 2013 08:07:10 -0700
Subject: [PATCH] Session invalidation is done after the custom error handling

Signed-off-by: Madhu Venugopal <vmadhu@cisco.com>
---
 .../web/devices/src/main/resources/WEB-INF/jsp/autherror.jsp    | 2 +-
 .../web/flows/src/main/resources/WEB-INF/jsp/autherror.jsp      | 2 +-
 .../web/root/src/main/resources/WEB-INF/jsp/autherror.jsp       | 2 +-
 .../web/topology/src/main/resources/WEB-INF/jsp/autherror.jsp   | 2 +-
 .../troubleshoot/src/main/resources/WEB-INF/jsp/autherror.jsp   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/opendaylight/web/devices/src/main/resources/WEB-INF/jsp/autherror.jsp b/opendaylight/web/devices/src/main/resources/WEB-INF/jsp/autherror.jsp
index ef42d286eb..127a5a09dd 100644
--- a/opendaylight/web/devices/src/main/resources/WEB-INF/jsp/autherror.jsp
+++ b/opendaylight/web/devices/src/main/resources/WEB-INF/jsp/autherror.jsp
@@ -15,7 +15,6 @@
 
 <c:set var="title" value="OpenDaylight login error" scope="application"/>
 <%
-	if (session != null) session.invalidate();
     String filePath = "/WEB-INF/jsp/customerror.jsp"; 
 	URL fileURL = pageContext.getServletContext().getResource(filePath);
 	if(fileURL!=null) {
@@ -51,5 +50,6 @@
     </div>
   </div> 
   </form>
+  <% if (session != null) session.invalidate(); %>  
 </body>
 </html>
diff --git a/opendaylight/web/flows/src/main/resources/WEB-INF/jsp/autherror.jsp b/opendaylight/web/flows/src/main/resources/WEB-INF/jsp/autherror.jsp
index ef42d286eb..127a5a09dd 100644
--- a/opendaylight/web/flows/src/main/resources/WEB-INF/jsp/autherror.jsp
+++ b/opendaylight/web/flows/src/main/resources/WEB-INF/jsp/autherror.jsp
@@ -15,7 +15,6 @@
 
 <c:set var="title" value="OpenDaylight login error" scope="application"/>
 <%
-	if (session != null) session.invalidate();
     String filePath = "/WEB-INF/jsp/customerror.jsp"; 
 	URL fileURL = pageContext.getServletContext().getResource(filePath);
 	if(fileURL!=null) {
@@ -51,5 +50,6 @@
     </div>
   </div> 
   </form>
+  <% if (session != null) session.invalidate(); %>  
 </body>
 </html>
diff --git a/opendaylight/web/root/src/main/resources/WEB-INF/jsp/autherror.jsp b/opendaylight/web/root/src/main/resources/WEB-INF/jsp/autherror.jsp
index ef42d286eb..a2fa4287a5 100644
--- a/opendaylight/web/root/src/main/resources/WEB-INF/jsp/autherror.jsp
+++ b/opendaylight/web/root/src/main/resources/WEB-INF/jsp/autherror.jsp
@@ -15,7 +15,6 @@
 
 <c:set var="title" value="OpenDaylight login error" scope="application"/>
 <%
-	if (session != null) session.invalidate();
     String filePath = "/WEB-INF/jsp/customerror.jsp"; 
 	URL fileURL = pageContext.getServletContext().getResource(filePath);
 	if(fileURL!=null) {
@@ -51,5 +50,6 @@
     </div>
   </div> 
   </form>
+  <% if (session != null) session.invalidate(); %>
 </body>
 </html>
diff --git a/opendaylight/web/topology/src/main/resources/WEB-INF/jsp/autherror.jsp b/opendaylight/web/topology/src/main/resources/WEB-INF/jsp/autherror.jsp
index ef42d286eb..127a5a09dd 100644
--- a/opendaylight/web/topology/src/main/resources/WEB-INF/jsp/autherror.jsp
+++ b/opendaylight/web/topology/src/main/resources/WEB-INF/jsp/autherror.jsp
@@ -15,7 +15,6 @@
 
 <c:set var="title" value="OpenDaylight login error" scope="application"/>
 <%
-	if (session != null) session.invalidate();
     String filePath = "/WEB-INF/jsp/customerror.jsp"; 
 	URL fileURL = pageContext.getServletContext().getResource(filePath);
 	if(fileURL!=null) {
@@ -51,5 +50,6 @@
     </div>
   </div> 
   </form>
+  <% if (session != null) session.invalidate(); %>  
 </body>
 </html>
diff --git a/opendaylight/web/troubleshoot/src/main/resources/WEB-INF/jsp/autherror.jsp b/opendaylight/web/troubleshoot/src/main/resources/WEB-INF/jsp/autherror.jsp
index ef42d286eb..a2fa4287a5 100644
--- a/opendaylight/web/troubleshoot/src/main/resources/WEB-INF/jsp/autherror.jsp
+++ b/opendaylight/web/troubleshoot/src/main/resources/WEB-INF/jsp/autherror.jsp
@@ -15,7 +15,6 @@
 
 <c:set var="title" value="OpenDaylight login error" scope="application"/>
 <%
-	if (session != null) session.invalidate();
     String filePath = "/WEB-INF/jsp/customerror.jsp"; 
 	URL fileURL = pageContext.getServletContext().getResource(filePath);
 	if(fileURL!=null) {
@@ -51,5 +50,6 @@
     </div>
   </div> 
   </form>
+  <% if (session != null) session.invalidate(); %>
 </body>
 </html>
-- 
2.36.6