Author: chris.laprun(a)jboss.com Date: 2009-12-21 12:23:34 -0500 (Mon, 21 Dec 2009) New Revision: 1105 Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/WSRPConsumerImpl.java Log: - More generification. - Proper logging of activation. Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/WSRPConsumerImpl.java =================================================================== --- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/WSRPConsumerImpl.java 2009-12-21 14:57:36 UTC (rev 1104) +++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/WSRPConsumerImpl.java 2009-12-21 17:23:34 UTC (rev 1105) @@ -137,12 +137,12 @@ // PortletInvoker implementation ************************************************************************************ - public Set getPortlets() throws InvokerUnavailableException + public Set<Portlet> getPortlets() throws InvokerUnavailableException { try { Map portletMap = producerInfo.getPortletMap(); - return new LinkedHashSet(portletMap.values()); + return new LinkedHashSet<Portlet>(portletMap.values()); } catch (Exception e) { @@ -217,14 +217,14 @@ } } - public List destroyClones(List portletContexts) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException + public List<DestroyCloneFailure> destroyClones(List<PortletContext> portletContexts) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException { ParameterValidation.throwIllegalArgExceptionIfNull(portletContexts, "Portlet identifiers"); int numberOfClones = portletContexts.size(); if (numberOfClones == 0) { - return Collections.EMPTY_LIST; + return Collections.emptyList(); } List<String> handles = new ArrayList<String>(numberOfClones); @@ -480,6 +480,7 @@ { internalStart(); producerInfo.setActiveAndSave(true); + log.info("Consumer with id '" + getProducerId() + "' activated"); } private void internalStart() throws Exception @@ -496,8 +497,6 @@ producerInfo.setActiveAndSave(false); throw e; } - - log.info("Consumer with id '" + getProducerId() + "' activated"); } }