[prev in list] [next in list] [prev in thread] [next in thread] 

List:       jakarta-commons-dev
Subject:    cvs commit: jakarta-commons/discovery/src/java/org/apache/commons/discovery/tools ResourceUtils.java
From:       rsitze () apache ! org
Date:       2002-08-30 15:06:17
[Download RAW message or body]

rsitze      2002/08/30 08:06:17

  Modified:    discovery/src/java/org/apache/commons/discovery/tools
                        ResourceUtils.java
  Log:
  NPE fix
  
  Revision  Changes    Path
  1.5       +11 -11    \
jakarta-commons/discovery/src/java/org/apache/commons/discovery/tools/ResourceUtils.java
  
  Index: ResourceUtils.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/discovery/src/java/org/apache/commons/discovery/tools/ResourceUtils.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ResourceUtils.java	30 Aug 2002 00:15:19 -0000	1.4
  +++ ResourceUtils.java	30 Aug 2002 15:06:17 -0000	1.5
  @@ -172,17 +172,17 @@
           
           if (propertiesFileName != null) {
               try {
  -                InputStream stream =
  -                    getResource(spi,
  -                                propertiesFileName,
  -                                classLoaders).getResourceAsStream();
  -    
  -                if (stream != null) {
  -                    properties = new Properties();
  -                    try {
  -                        properties.load(stream);
  -                    } finally {
  -                        stream.close();
  +                Resource resource = getResource(spi, propertiesFileName, \
classLoaders);  +                if (resource != null) {
  +                    InputStream stream = resource.getResourceAsStream();
  +        
  +                    if (stream != null) {
  +                        properties = new Properties();
  +                        try {
  +                            properties.load(stream);
  +                        } finally {
  +                            stream.close();
  +                        }
                       }
                   }
               } catch (IOException e) {
  
  
  

--
To unsubscribe, e-mail:   <mailto:commons-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:commons-dev-help@jakarta.apache.org>


[prev in list] [next in list] [prev in thread] [next in thread]