svn commit: r1684248 - in /webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite: State.java WritableBlobTestCase.java

[veithen]

Author: veithen
Date: Mon Jun  8 19:14:26 2015
New Revision: 1684248

URL: http://svn.apache.org/r1684248
Log:
Make sure that unit tests properly release blobs.

Modified:
    
webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/State.java
    
webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/WritableBlobTestCase.java

Modified: 
webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/State.java
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/State.java?rev=1684248&r1=1684247&r2=1684248&view=diff
==============================================================================
--- 
webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/State.java
 (original)
+++ 
webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/State.java
 Mon Jun  8 19:14:26 2015
@@ -40,7 +40,6 @@ public abstract class State implements D
             return new CleanupCallback() {
                 public void cleanup() throws IOException {
                     out.close();
-                    blob.release();
                 }
             };
         }
@@ -50,11 +49,7 @@ public abstract class State implements D
         @Override
         public CleanupCallback transition(final WritableBlob blob) throws 
IOException {
             blob.getOutputStream().close();
-            return new CleanupCallback() {
-                public void cleanup() throws IOException {
-                    blob.release();
-                }
-            };
+            return null;
         }
     };
 

Modified: 
webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/WritableBlobTestCase.java
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/WritableBlobTestCase.java?rev=1684248&r1=1684247&r2=1684248&view=diff
==============================================================================
--- 
webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/WritableBlobTestCase.java
 (original)
+++ 
webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/WritableBlobTestCase.java
 Mon Jun  8 19:14:26 2015
@@ -34,13 +34,17 @@ public abstract class WritableBlobTestCa
     @Override
     protected final void runTest() throws Throwable {
         WritableBlob blob = factory.createBlob();
-        CleanupCallback cleanupCallback = initialState.transition(blob);
         try {
-            runTest(blob);
-        } finally {
-            if (cleanupCallback != null) {
-                cleanupCallback.cleanup();
+            CleanupCallback cleanupCallback = initialState.transition(blob);
+            try {
+                runTest(blob);
+            } finally {
+                if (cleanupCallback != null) {
+                    cleanupCallback.cleanup();
+                }
             }
+        } finally {
+            blob.release();
         }
     }