Author: chris.laprun(a)jboss.com Date: 2007-01-08 17:47:50 -0500 (Mon, 08 Jan 2007) New Revision: 5967 Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/ServiceDescriptionHandler.java Log: - Avoid useless work if there aren't any registration properties. Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/ServiceDescriptionHandler.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/ServiceDescriptionHandler.java 2007-01-08 22:46:42 UTC (rev 5966) +++ trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/ServiceDescriptionHandler.java 2007-01-08 22:47:50 UTC (rev 5967) @@ -39,6 +39,7 @@ import org.jboss.portal.wsrp.core.InvalidHandleFault; import org.jboss.portal.wsrp.core.InvalidRegistrationFault; import org.jboss.portal.wsrp.core.MarkupType; +import org.jboss.portal.wsrp.core.ModelDescription; import org.jboss.portal.wsrp.core.OperationFailedFault; import org.jboss.portal.wsrp.core.PortletDescription; import org.jboss.portal.wsrp.core.ServiceDescription; @@ -51,6 +52,7 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Locale; +import java.util.Map; import java.util.Set; /** @@ -131,6 +133,7 @@ { // todo: find out how to cache this ProducerRegistrationRequirements requirements = producer.getProducerRegistrationRequirements(); + // should we be sending the registration properties description as well? ServiceDescription serviceDescription = WSRPTypeFactory.createServiceDescription(requirements.requiresRegistration()); serviceDescription.setRequiresInitCookie(CookieProtocol.none); PortletDescription[] descriptions = getPortletDescriptions(desiredLocales); @@ -163,9 +166,16 @@ offeredPortlets = getPortletDescriptions(desiredLocales); } + // do not create a ModelDescription if there is no registration properties + Map info = requirements.getRegistrationProperties(); + ModelDescription description = null; + if (info != null && !info.isEmpty()) + { + description = WSRPUtils.convertRegistrationPropertiesToModelDescription(info); + } + return new ServiceDescription(true, offeredPortlets, null, null, null, null, CookieProtocol.none, - WSRPUtils.convertRegistrationPropertiesToModelDescription(requirements.getRegistrationProperties()), - producer.getSupportedLocales(), null, null); + description, producer.getSupportedLocales(), null, null); } /**