svn commit: r1228022 - /archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultCommonServices.java

[olamy]

Author: olamy
Date: Fri Jan  6 08:56:03 2012
New Revision: 1228022

URL: http://svn.apache.org/viewvc?rev=1228022&view=rev
Log:
close StringReader

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultCommonServices.java

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultCommonServices.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultCommonServices.java?rev=1228022&r1=1228021&r2=1228022&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultCommonServices.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultCommonServices.java
 Fri Jan  6 08:56:03 2012
@@ -29,7 +29,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import javax.inject.Inject;
-import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Response;
 import java.io.IOException;
 import java.io.InputStream;
@@ -124,18 +123,34 @@ public class DefaultCommonServices
             String redbackProps = utilServices.getI18nResources( locale );
             String archivaProps = getI18nResources( locale );
             Properties properties = new Properties();
-            properties.load( new StringReader( redbackProps ) );
-            properties.load( new StringReader( archivaProps ) );
+            loadFromString( redbackProps, properties );
+            loadFromString( archivaProps, properties );
             return fromProperties( properties );
         }
         catch ( RedbackServiceException e )
         {
             throw new ArchivaRestServiceException( e.getMessage(), 
e.getHttpErrorCode() );
         }
+    }
+
+    private void loadFromString( String propsStr, Properties properties )
+        throws ArchivaRestServiceException
+    {
+
+        StringReader stringReader = null;
+        try
+        {
+            stringReader = new StringReader( propsStr );
+            properties.load( stringReader );
+        }
         catch ( IOException e )
         {
             throw new ArchivaRestServiceException( e.getMessage(),
                                                    
Response.Status.INTERNAL_SERVER_ERROR.getStatusCode() );
         }
+        finally
+        {
+            IOUtils.closeQuietly( stringReader );
+        }
     }
 }