You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ec...@apache.org on 2008/02/08 19:15:47 UTC

svn commit: r619966 - /geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MonitoringPortlet.java

Author: ecraig
Date: Fri Feb  8 10:15:43 2008
New Revision: 619966

URL: http://svn.apache.org/viewvc?rev=619966&view=rev
Log:
Added error checking to prevent user from inadvertently entering 'edit' mode in the portlet causing a bomb.
 

Modified:
    geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MonitoringPortlet.java

Modified: geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MonitoringPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MonitoringPortlet.java?rev=619966&r1=619965&r2=619966&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MonitoringPortlet.java (original)
+++ geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MonitoringPortlet.java Fri Feb  8 10:15:43 2008
@@ -379,6 +379,8 @@
     protected void doEdit(RenderRequest request, RenderResponse response)
             throws PortletException, IOException {
         String action = request.getParameter("action");
+        if (action == null)
+            action = "showNormal";
         if (action.equals("showEditView")) {
             String view_id = request.getParameter("view_id");
             request.setAttribute("view_id", view_id);
@@ -489,7 +491,7 @@
                             .getParameter("server_id"));
             normalView.include(request, response);
         } else {
-            editNormalView.include(request, response);
+            normalView.include(request, response);
         }
     }