geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jb...@apache.org
Subject svn commit: r740999 - /geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/servermanager/ServerManagerPortlet.java
Date Thu, 05 Feb 2009 04:42:26 GMT
Author: jbohn
Date: Thu Feb  5 04:42:26 2009
New Revision: 740999

URL: http://svn.apache.org/viewvc?rev=740999&view=rev
Log:
move shutdown processing from doView to processAction in portlet

Modified:
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/servermanager/ServerManagerPortlet.java

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/servermanager/ServerManagerPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/servermanager/ServerManagerPortlet.java?rev=740999&r1=740998&r2=740999&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/servermanager/ServerManagerPortlet.java
(original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/servermanager/ServerManagerPortlet.java
Thu Feb  5 04:42:26 2009
@@ -61,22 +61,16 @@
                 }
             }.start();
         } else if(actionRequest.getParameter("shutdown") != null) {
-            actionResponse.setRenderParameter("shutdown", actionRequest.getParameter("shutdown"));
+            log.info("Shutting down by user request: " + actionRequest.getUserPrincipal().getName());
+            kernel.shutdown();
+            System.exit(0);
         }
     }
 
     protected void doView(RenderRequest request, RenderResponse response)
             throws PortletException, IOException {
-        if (request.getParameter("shutdown") != null) {
-            log.info("Shutting down by user request: " + request.getUserPrincipal().getName());
-            shutdownView.include(request, response);
-            response.flushBuffer();
-            kernel.shutdown();
-            System.exit(0);
-        } else {
-            addWarningMessage(request, getLocalizedString(request, "warnMsg07"));
-            normalView.include(request, response);
-        }
+        addWarningMessage(request, getLocalizedString(request, "warnMsg07"));
+        normalView.include(request, response);
     }
 
     protected void doHelp(RenderRequest renderRequest,



Mime
View raw message