geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke...@apache.org
Subject svn commit: r620025 - /geronimo/server/branches/2.1.0/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MonitoringPortlet.java
Date Fri, 08 Feb 2008 22:57:39 GMT
Author: kevan
Date: Fri Feb  8 14:57:38 2008
New Revision: 620025

URL: http://svn.apache.org/viewvc?rev=620025&view=rev
Log:
Merge from branches/2.1 to fix error if edit mode is incorrectly clicked in monitoring console

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

Modified: geronimo/server/branches/2.1.0/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.0/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MonitoringPortlet.java?rev=620025&r1=620024&r2=620025&view=diff
==============================================================================
--- geronimo/server/branches/2.1.0/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MonitoringPortlet.java
(original)
+++ geronimo/server/branches/2.1.0/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MonitoringPortlet.java
Fri Feb  8 14:57:38 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);
         }
     }
 



Mime
View raw message