You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by cd...@apache.org on 2008/10/18 05:48:07 UTC

svn commit: r705838 - /portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletDescriptorRegistry.java

Author: cdoremus
Date: Fri Oct 17 20:48:07 2008
New Revision: 705838

URL: http://svn.apache.org/viewvc?rev=705838&view=rev
Log:
Applied patch suggested in PLUTO-512. Thank you Antony!

Modified:
    portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletDescriptorRegistry.java

Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletDescriptorRegistry.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletDescriptorRegistry.java?rev=705838&r1=705837&r2=705838&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletDescriptorRegistry.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletDescriptorRegistry.java Fri Oct 17 20:48:07 2008
@@ -141,6 +141,10 @@
         PortletApplicationDefinition portletApp = null;
         try {
             InputStream in = servletContext.getResourceAsStream(PORTLET_XML);
+            if (in == null) {
+	            throw new PortletContainerException("Cannot find '" + PORTLET_XML +
+	            	"'. Are you sure it is in the deployed package?");
+            }
             portletApp = portletDDService.read(in);
         } catch (IOException ex) {
             throw new PortletContainerException(EXCEPTIONS.getString(