You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by am...@apache.org on 2005/11/16 18:54:15 UTC
svn commit: r345068 -
/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java
Author: ammulder
Date: Wed Nov 16 09:54:12 2005
New Revision: 345068
URL: http://svn.apache.org/viewcvs?rev=345068&view=rev
Log:
Don't barf if a non-list portlet links back to list (GERONIMO-1186)
Modified:
geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java
Modified: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java?rev=345068&r1=345067&r2=345068&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java (original)
+++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java Wed Nov 16 09:54:12 2005
@@ -65,8 +65,8 @@
String mode = actionRequest.getParameter("mode");
String managerName = actionRequest.getParameter("managerObjectName");
String containerName = actionRequest.getParameter("containerObjectName");
- actionResponse.setRenderParameter("managerObjectName", managerName);
- actionResponse.setRenderParameter("containerObjectName", containerName);
+ if(managerName != null) actionResponse.setRenderParameter("managerObjectName", managerName);
+ if(containerName != null) actionResponse.setRenderParameter("containerObjectName", containerName);
WebContainer container = PortletManager.getWebContainer(actionRequest, containerName);
String server = getWebServerType(container.getClass());
@@ -276,8 +276,8 @@
} else {
String managerName = renderRequest.getParameter("managerObjectName");
String containerName = renderRequest.getParameter("containerObjectName");
- renderRequest.setAttribute("managerObjectName", managerName);
- renderRequest.setAttribute("containerObjectName", containerName);
+ if(managerName != null) renderRequest.setAttribute("managerObjectName", managerName);
+ if(containerName != null) renderRequest.setAttribute("containerObjectName", containerName);
WebContainer container = PortletManager.getWebContainer(renderRequest, containerName);
String server = getWebServerType(container.getClass());