[jboss-cvs] jboss-portal/portlet/src/main/org/jboss/portal/portlet/container ...

[Julien Viet]

  User: julien  
  Date: 06/07/31 15:29:52

  Modified:    portlet/src/main/org/jboss/portal/portlet/container 
                        PortletContainerInvoker.java
  Log:
  - moved the portal api in the api module in order to have a standalone jar
  - JBPORTAL-631 : Try to move org.jboss.portlet package to the api module
  - IPC support in 2.4 (only for local portlets)
  
  Revision  Changes    Path
  1.24      +8 -3      jboss-portal/portlet/src/main/org/jboss/portal/portlet/container/PortletContainerInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PortletContainerInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/portlet/src/main/org/jboss/portal/portlet/container/PortletContainerInvoker.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -b -r1.23 -r1.24
  --- PortletContainerInvoker.java	26 Jun 2006 07:14:10 -0000	1.23
  +++ PortletContainerInvoker.java	31 Jul 2006 19:29:52 -0000	1.24
  @@ -45,7 +45,7 @@
    * An implementation of portlet invoker that makes a call to a portlet container.
    *
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  - * @version $Revision: 1.23 $
  + * @version $Revision: 1.24 $
    */
   public class PortletContainerInvoker extends AbstractJBossService implements PortletInvoker
   {
  @@ -92,13 +92,18 @@
         return containers;
      }
   
  -   public Portlet getPortlet(String portletId)
  +   public Portlet getPortlet(String portletId) throws NoSuchPortletException
      {
         if (portletId == null)
         {
            throw new IllegalArgumentException("No null portlet id accepted");
         }
  -      return registry.getPortletContainer(portletId);
  +      PortletContainer container = registry.getPortletContainer(portletId);
  +      if (container == null)
  +      {
  +         throw new NoSuchPortletException(portletId);
  +      }
  +      return container;
      }
   
      public void invoke(PortletInvocation invocation) throws PortletInvokerException, InvocationException