jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1201842 - /jmeter/trunk/test/src/org/apache/jmeter/resources/PackageTest.java
Date Mon, 14 Nov 2011 19:33:07 GMT
Author: pmouawad
Date: Mon Nov 14 19:33:07 2011
New Revision: 1201842

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

Modified:
    jmeter/trunk/test/src/org/apache/jmeter/resources/PackageTest.java

Modified: jmeter/trunk/test/src/org/apache/jmeter/resources/PackageTest.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/resources/PackageTest.java?rev=1201842&r1=1201841&r2=1201842&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/resources/PackageTest.java (original)
+++ jmeter/trunk/test/src/org/apache/jmeter/resources/PackageTest.java Mon Nov 14 19:33:07
2011
@@ -31,6 +31,7 @@ import java.util.MissingResourceExceptio
 import java.util.PropertyResourceBundle;
 
 import org.apache.jmeter.gui.util.JMeterMenuBar;
+import org.apache.jorphan.util.JOrphanUtils;
 
 import junit.framework.Test;
 import junit.framework.TestCase;
@@ -91,47 +92,53 @@ public class PackageTest extends TestCas
                 return 0;
             }
         }
-        BufferedReader fileReader = new BufferedReader(new InputStreamReader(ras));
-        String s;
-        while ((s = fileReader.readLine()) != null) {
-            if (s.length() > 0 && !s.startsWith("#") && !s.startsWith("!"))
{
-                int equ = s.indexOf('=');
-                String key = s.substring(0, equ);
-                if (resourcePrefix.equals(MESSAGES)){// Only relevant for messages
-                    /*
-                     * JMeterUtils.getResString() converts space to _ and lowercases
-                     * the key, so make sure all keys pass the test
-                     */
-                    if ((key.indexOf(' ') >= 0) || !key.toLowerCase(java.util.Locale.ENGLISH).equals(key))
{
-                        System.out.println("Invalid key for JMeterUtils " + key);
-                        fails++;
-                    }
-                }
-                String val = s.substring(equ + 1);
-                l.add(key); // Store the key
-                /*
-                 * Now check for invalid message format: if string contains {0}
-                 * and ' there may be a problem, so do a format with dummy
-                 * parameters and check if there is a { in the output. A bit
-                 * crude, but should be enough for now.
-                 */
-                if (val.indexOf("{0}") > 0 && val.indexOf("'") > 0) {
-                    String m = java.text.MessageFormat.format(val, DUMMY_PARAMS);
-                    if (m.indexOf("{") > 0) {
-                        fails++;
-                        System.out.println("Incorrect message format ? (input/output) for:
"+key);
-                        System.out.println(val);
-                        System.out.println(m);
-                    }
-                }
-
-                if (!isPureAscii(val)) {
-                    fails++;
-                    System.out.println("Incorrect char value in: "+s);                  
 
-                }
-            }
+        BufferedReader fileReader = null;
+        try {
+        	fileReader = new BufferedReader(new InputStreamReader(ras));
+	        String s;
+	        while ((s = fileReader.readLine()) != null) {
+	            if (s.length() > 0 && !s.startsWith("#") && !s.startsWith("!"))
{
+	                int equ = s.indexOf('=');
+	                String key = s.substring(0, equ);
+	                if (resourcePrefix.equals(MESSAGES)){// Only relevant for messages
+	                    /*
+	                     * JMeterUtils.getResString() converts space to _ and lowercases
+	                     * the key, so make sure all keys pass the test
+	                     */
+	                    if ((key.indexOf(' ') >= 0) || !key.toLowerCase(java.util.Locale.ENGLISH).equals(key))
{
+	                        System.out.println("Invalid key for JMeterUtils " + key);
+	                        fails++;
+	                    }
+	                }
+	                String val = s.substring(equ + 1);
+	                l.add(key); // Store the key
+	                /*
+	                 * Now check for invalid message format: if string contains {0}
+	                 * and ' there may be a problem, so do a format with dummy
+	                 * parameters and check if there is a { in the output. A bit
+	                 * crude, but should be enough for now.
+	                 */
+	                if (val.indexOf("{0}") > 0 && val.indexOf("'") > 0) {
+	                    String m = java.text.MessageFormat.format(val, DUMMY_PARAMS);
+	                    if (m.indexOf("{") > 0) {
+	                        fails++;
+	                        System.out.println("Incorrect message format ? (input/output) for:
"+key);
+	                        System.out.println(val);
+	                        System.out.println(m);
+	                    }
+	                }
+	
+	                if (!isPureAscii(val)) {
+	                    fails++;
+	                    System.out.println("Incorrect char value in: "+s);                 
  
+	                }
+	            }
+	        }
+	        return fails;
+        }
+        finally {
+        	JOrphanUtils.closeQuietly(fileReader);
         }
-        return fails;
     }
 
     // Helper method to construct resource name



Mime
View raw message