perfsonar development work

Author: pgerakios
Date: 2008-11-27 03:15:55 -0500 (Thu, 27 Nov 2008)
New Revision: 4704

Modified:
   branches/WebAdmin/CHANGELOG
   branches/WebAdmin/ant/const.properties
   branches/WebAdmin/perfSONARWebAdmin/admin/stitching/StitchingServlet.java
Log:
Version 0.9.1c - Minor bug fix

Modified: branches/WebAdmin/CHANGELOG
===================================================================
--- branches/WebAdmin/CHANGELOG 2008-11-26 14:53:17 UTC (rev 4703)
+++ branches/WebAdmin/CHANGELOG 2008-11-27 08:15:55 UTC (rev 4704)
@@ -22,3 +22,8 @@
 - Fixed HTML bug - Now HTML is displayed properly for all services
 - Fixed LS label bug in Wizard - radio button
 - Added debugging code
+
+
+0.9.1c:
+
+Fixed the blank page issue when clicking on the "Metadata Configuration file"

Modified: branches/WebAdmin/ant/const.properties
===================================================================
--- branches/WebAdmin/ant/const.properties      2008-11-26 14:53:17 UTC (rev 
4703)
+++ branches/WebAdmin/ant/const.properties      2008-11-27 08:15:55 UTC (rev 
4704)
@@ -9,7 +9,7 @@
 target.server=127.0.0.1
 service.name=perfsonar-web-admin
 jarfilename=perfsonar-web-admin
-version=0.9.0c
+version=0.9.1c
 
 antcontrib.jar=${basedir}/lib/misc/ant-contrib-1.0b3.jar
 antpsbase.jar=${basedir}/lib/misc/perfsonar-base-ant-1.0.20080303.jar

Modified: 
branches/WebAdmin/perfSONARWebAdmin/admin/stitching/StitchingServlet.java
===================================================================
--- branches/WebAdmin/perfSONARWebAdmin/admin/stitching/StitchingServlet.java 
  2008-11-26 14:53:17 UTC (rev 4703)
+++ branches/WebAdmin/perfSONARWebAdmin/admin/stitching/StitchingServlet.java 
  2008-11-27 08:15:55 UTC (rev 4704)
@@ -136,7 +136,6 @@
         */
        public void doPost(HttpServletRequest request, HttpServletResponse 
response)
                        throws IOException {
-
                HttpSession session = request.getSession(true);
                if (session.isNew())
                        session.setMaxInactiveInterval(1800);
@@ -164,20 +163,22 @@
 
                // Checking if authentication has happened and if it was 
successful
                if (session.getAttribute("authenticated") != null) {
+
                        if (((Boolean) session.getAttribute("authenticated"))
                                        .booleanValue()) {
 
                                try {
-
                                        servletActions(request, response);
                                } catch (Exception e) {
                                        throw new IOException(getFault(e));
                                }
 
                        } else {
+
                                // If "authenticated" is false we invalidate 
the session so that
                                // the user can try again
                                session.invalidate();
+                               askForPassword(response);
                        }
                } else {
                        // If the "authenticated" parameter has not been set 
then we ask for