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 ed...@apache.org on 2010/10/27 02:09:59 UTC

svn commit: r1027780 - in /portals/pluto: branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/impl/ trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/

Author: edalquist
Date: Wed Oct 27 00:09:59 2010
New Revision: 1027780

URL: http://svn.apache.org/viewvc?rev=1027780&view=rev
Log:
PLUTO-601 Throw IOException instead of NullPointerException when passed a null InputStream to keep functionality consistent between releases.

Modified:
    portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletAppDescriptorServiceImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletAppDescriptorServiceImpl.java

Modified: portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletAppDescriptorServiceImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletAppDescriptorServiceImpl.java?rev=1027780&r1=1027779&r2=1027780&view=diff
==============================================================================
--- portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletAppDescriptorServiceImpl.java (original)
+++ portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletAppDescriptorServiceImpl.java Wed Oct 27 00:09:59 2010
@@ -199,6 +199,10 @@ public class PortletAppDescriptorService
      */
     public PortletApplicationDefinition read(String name, String contextPath, InputStream in) throws IOException 
     {
+        if (in == null) {
+            throw new IOException("Cannot read from a null InputStream");
+        }
+        
         final XMLInputFactory xmlInputFactory = getXmlInputFactory();
         
         //Generate an xml stream reader for the input stream 

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletAppDescriptorServiceImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletAppDescriptorServiceImpl.java?rev=1027780&r1=1027779&r2=1027780&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletAppDescriptorServiceImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletAppDescriptorServiceImpl.java Wed Oct 27 00:09:59 2010
@@ -199,6 +199,10 @@ public class PortletAppDescriptorService
      */
     public PortletApplicationDefinition read(String name, String contextPath, InputStream in) throws IOException 
     {
+        if (in == null) {
+            throw new IOException("Cannot read from a null InputStream");
+        }
+        
         final XMLInputFactory xmlInputFactory = getXmlInputFactory();
         
         //Generate an xml stream reader for the input stream