From: Madhu Venugopal <vmadhu@cisco.com>
Date: Tue, 14 May 2013 15:07:10 +0000 (-0700)
Subject: Session invalidation is done after the custom error handling
X-Git-Tag: releasepom-0.1.0~459^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=ad51f03cc9f7e0270063344fc2464071d6fa326e

Session invalidation is done after the custom error handling

Signed-off-by: Madhu Venugopal <vmadhu@cisco.com>
---

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>