You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2012/10/22 10:14:07 UTC

svn commit: r1400793 - /axis/axis1/java/trunk/axis-rt-core/src/test/java/test/utils/TestSrcContent.java

Author: veithen
Date: Mon Oct 22 08:14:07 2012
New Revision: 1400793

URL: http://svn.apache.org/viewvc?rev=1400793&view=rev
Log:
Ensure that TestSrcContent properly closes files to avoid a build failure due to too many open files.

Modified:
    axis/axis1/java/trunk/axis-rt-core/src/test/java/test/utils/TestSrcContent.java

Modified: axis/axis1/java/trunk/axis-rt-core/src/test/java/test/utils/TestSrcContent.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-rt-core/src/test/java/test/utils/TestSrcContent.java?rev=1400793&r1=1400792&r2=1400793&view=diff
==============================================================================
--- axis/axis1/java/trunk/axis-rt-core/src/test/java/test/utils/TestSrcContent.java (original)
+++ axis/axis1/java/trunk/axis-rt-core/src/test/java/test/utils/TestSrcContent.java Mon Oct 22 08:14:07 2012
@@ -214,21 +214,25 @@ public class TestSrcContent extends Test
     private void checkFile(File file) {
         try {
             FileInputStream fis = new FileInputStream(file);
-            byte[] bytes = new byte[fis.available()];
-            fis.read(bytes);
-            String content = new String(bytes);
-
-            for (int i = 0; i < avoidPatterns.length; i++) {
-                if (avoidPatterns[i].noMatch(file.getPath(), content)) {
-                //                if (content.indexOf(avoidStrings[i]) >= 0) {
-                    errors = errors
-                        + "File: " + file.getPath() + ": "
-                        + (avoidPatterns[i].getExpectContent()
-                           ? "Expected: "
-                           : "Unexpected: ")
-                        + avoidPatterns[i].getContentPattern()
-                        + LS;
+            try {
+                byte[] bytes = new byte[fis.available()];
+                fis.read(bytes);
+                String content = new String(bytes);
+    
+                for (int i = 0; i < avoidPatterns.length; i++) {
+                    if (avoidPatterns[i].noMatch(file.getPath(), content)) {
+                    //                if (content.indexOf(avoidStrings[i]) >= 0) {
+                        errors = errors
+                            + "File: " + file.getPath() + ": "
+                            + (avoidPatterns[i].getExpectContent()
+                               ? "Expected: "
+                               : "Unexpected: ")
+                            + avoidPatterns[i].getContentPattern()
+                            + LS;
+                    }
                 }
+            } finally {
+                fis.close();
             }
         }
         catch (Throwable t) {