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:47:12 UTC
svn commit: r705837 -
/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/PortletDescriptorRegistry.java
Author: cdoremus
Date: Fri Oct 17 20:47:11 2008
New Revision: 705837
URL: http://svn.apache.org/viewvc?rev=705837&view=rev
Log:
Applied patch suggested in PLUTO-512. Thank you Antony!
Modified:
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/PortletDescriptorRegistry.java
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/PortletDescriptorRegistry.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/PortletDescriptorRegistry.java?rev=705837&r1=705836&r2=705837&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/PortletDescriptorRegistry.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/PortletDescriptorRegistry.java Fri Oct 17 20:47:11 2008
@@ -140,6 +140,10 @@
PortletAppDD portletAppDD = 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?");
+ }
portletAppDD = portletDDService.read(in);
} catch (IOException ex) {
throw new PortletContainerException(EXCEPTIONS.getString(