incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1362396 - in /sling/whiteboard/portal/container-api: ./ src/main/java/org/apache/sling/portal/container/api/ src/main/resources/
Date Tue, 17 Jul 2012 08:12:19 GMT
Author: cziegeler
Date: Tue Jul 17 08:12:18 2012
New Revision: 1362396

URL: http://svn.apache.org/viewvc?rev=1362396&view=rev
Log:
Some cosmetics

Removed:
    sling/whiteboard/portal/container-api/LICENSE
    sling/whiteboard/portal/container-api/NOTICE
    sling/whiteboard/portal/container-api/src/main/resources/
Modified:
    sling/whiteboard/portal/container-api/src/main/java/org/apache/sling/portal/container/api/ContainerServlet.java
    sling/whiteboard/portal/container-api/src/main/java/org/apache/sling/portal/container/api/PortletApplicationRegistryListener.java

Modified: sling/whiteboard/portal/container-api/src/main/java/org/apache/sling/portal/container/api/ContainerServlet.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/portal/container-api/src/main/java/org/apache/sling/portal/container/api/ContainerServlet.java?rev=1362396&r1=1362395&r2=1362396&view=diff
==============================================================================
--- sling/whiteboard/portal/container-api/src/main/java/org/apache/sling/portal/container/api/ContainerServlet.java
(original)
+++ sling/whiteboard/portal/container-api/src/main/java/org/apache/sling/portal/container/api/ContainerServlet.java
Tue Jul 17 08:12:18 2012
@@ -71,7 +71,7 @@ public class ContainerServlet
     /**
      * @see javax.servlet.http.HttpServlet#service(javax.servlet.ServletRequest, javax.servlet.ServletResponse)
      */
-    public void service(ServletRequest req, ServletResponse res)
+    public void service(final ServletRequest req, final ServletResponse res)
     throws ServletException, IOException {
         if ( req instanceof HttpServletRequest &&
              req.getAttribute(Container.ATTR_CONTAINER) != null ) {
@@ -83,13 +83,13 @@ public class ContainerServlet
             final Container container = (Container) request.getAttribute(Container.ATTR_CONTAINER);
             try {
                  container.service(request, response);
-            } catch (PortletException ex) {
+            } catch (final PortletException ex) {
                 throw new ServletException(ex);
             } finally {
                 req.removeAttribute(Container.ATTR_CONTAINER);
             }
-            return;
+        } else {
+            throw new ServletException("No portlet request.");
         }
-        throw new ServletException("No portlet request.");
     }
 }

Modified: sling/whiteboard/portal/container-api/src/main/java/org/apache/sling/portal/container/api/PortletApplicationRegistryListener.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/portal/container-api/src/main/java/org/apache/sling/portal/container/api/PortletApplicationRegistryListener.java?rev=1362396&r1=1362395&r2=1362396&view=diff
==============================================================================
--- sling/whiteboard/portal/container-api/src/main/java/org/apache/sling/portal/container/api/PortletApplicationRegistryListener.java
(original)
+++ sling/whiteboard/portal/container-api/src/main/java/org/apache/sling/portal/container/api/PortletApplicationRegistryListener.java
Tue Jul 17 08:12:18 2012
@@ -18,6 +18,8 @@ package org.apache.sling.portal.containe
 
 /**
  * This is a listener for the portlet registry.
+ *
+ * The calls to the listener are synchronized.
  */
 public interface PortletApplicationRegistryListener {
 



Mime
View raw message