openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r1536462 - in /openjpa/branches/2.3.x: ./ openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestUseSchemaElement.java
Date Mon, 28 Oct 2013 18:10:53 GMT
Author: struberg
Date: Mon Oct 28 18:10:53 2013
New Revision: 1536462

URL: http://svn.apache.org/r1536462
Log:
OPENJPA-2444 move the cleanup after freeing the InputStream

Win* blocks the whole file as long as the InputStream is not closed.
Thus we can only delete the file afterwards.


Modified:
    openjpa/branches/2.3.x/   (props changed)
    openjpa/branches/2.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestUseSchemaElement.java

Propchange: openjpa/branches/2.3.x/
------------------------------------------------------------------------------
  Merged /openjpa/trunk:r1536455

Modified: openjpa/branches/2.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestUseSchemaElement.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestUseSchemaElement.java?rev=1536462&r1=1536461&r2=1536462&view=diff
==============================================================================
--- openjpa/branches/2.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestUseSchemaElement.java
(original)
+++ openjpa/branches/2.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestUseSchemaElement.java
Mon Oct 28 18:10:53 2013
@@ -106,9 +106,6 @@ public class TestUseSchemaElement extend
                 }
             }
 
-            // Delete file to clean up workspace
-            assertTrue(uschantbl.delete());
-
         } catch (FileNotFoundException e) {
             fail("Uschantbl.java not generated in ./target by ReverseMappingTool");
         }
@@ -118,6 +115,9 @@ public class TestUseSchemaElement extend
             }
         }
 
+        // Delete file to clean up workspace
+        assertTrue(uschantbl.delete());
+
         // This tests the removal of the schema name from the orm.xml file
         File orm = new File("target/orm.xml");
         try {



Mime
View raw message