portals-pluto-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cdore...@apache.org
Subject svn commit: r705837 - /portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/PortletDescriptorRegistry.java
Date Sat, 18 Oct 2008 03:47:12 GMT
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(



Mime
View raw message