Code Review / controller.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw (from parent 1: 8992ae5)
Merge "Session invalidation is done after the custom error handling"
authorGiovanni Meo <gmeo@cisco.com>
Tue, 14 May 2013 15:22:16 +0000 (15:22 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Tue, 14 May 2013 15:22:16 +0000 (15:22 +0000)
opendaylight/web/devices/src/main/resources/WEB-INF/jsp/autherror.jsp patch | blob | history
opendaylight/web/flows/src/main/resources/WEB-INF/jsp/autherror.jsp patch | blob | history
opendaylight/web/root/src/main/resources/WEB-INF/jsp/autherror.jsp patch | blob | history
opendaylight/web/topology/src/main/resources/WEB-INF/jsp/autherror.jsp patch | blob | history
opendaylight/web/troubleshoot/src/main/resources/WEB-INF/jsp/autherror.jsp patch | blob | history

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 ef42d286eb712c1c6f97a87157acf438557e512e..127a5a09dd596158ea8e31f1318913caacd711d1 100644 (file)
--- 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 ef42d286eb712c1c6f97a87157acf438557e512e..127a5a09dd596158ea8e31f1318913caacd711d1 100644 (file)
--- 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 ef42d286eb712c1c6f97a87157acf438557e512e..a2fa4287a5c06b346c29633cc360169982ec0384 100644 (file)
--- 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 ef42d286eb712c1c6f97a87157acf438557e512e..127a5a09dd596158ea8e31f1318913caacd711d1 100644 (file)
--- 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 ef42d286eb712c1c6f97a87157acf438557e512e..a2fa4287a5c06b346c29633cc360169982ec0384 100644 (file)
--- 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>
OpenDaylight controller