BZ-1063469: use try/catch/finally on IOService batch processing

AppFormer · Feb 10, 2014 · 051ffeb · 051ffeb
1 parent 597618e
commit 051ffeb
Showing 1 changed file with 23 additions and 13 deletions.
diff --git a/...end-server/src/main/java/org/uberfire/backend/server/config/ConfigurationServiceImpl.java b/...end-server/src/main/java/org/uberfire/backend/server/config/ConfigurationServiceImpl.java
@@ -153,11 +153,14 @@ public boolean addConfiguration( final ConfigGroup configGroup ) {
 
         final CommentedOption commentedOption = new CommentedOption( getIdentityName(),
                                                                      "Created config " + filePath.getFileName() );
-        ioService.startBatch();
-        ioService.write( filePath, marshaller.marshall( configGroup ), commentedOption );
+        try {
+            ioService.startBatch();
+            ioService.write( filePath, marshaller.marshall( configGroup ), commentedOption );
 
-        updateLastModified();
-        ioService.endBatch();
+            updateLastModified();
+        } finally {
+            ioService.endBatch();
+        }
         //Invalidate cache if a new item has been created; otherwise cached value is stale
         configuration.remove( configGroup.getType() );
 
@@ -172,11 +175,14 @@ public boolean updateConfiguration( ConfigGroup configGroup ) {
 
         final CommentedOption commentedOption = new CommentedOption( getIdentityName(),
                                                                      "Updated config " + filePath.getFileName() );
-        ioService.startBatch();
-        ioService.write( filePath, marshaller.marshall( configGroup ), commentedOption );
+        try {
+            ioService.startBatch();
+            ioService.write( filePath, marshaller.marshall( configGroup ), commentedOption );
 
-        updateLastModified();
-        ioService.endBatch();
+            updateLastModified();
+        } finally {
+            ioService.endBatch();
+        }
         //Invalidate cache if a new item has been created; otherwise cached value is stale
         configuration.remove( configGroup.getType() );
 
@@ -195,12 +201,16 @@ public boolean removeConfiguration( final ConfigGroup configGroup ) {
         if ( !ioService.exists( filePath ) ) {
             return true;
         }
-        ioService.startBatch();
-        boolean result = ioService.deleteIfExists( filePath );
-        if ( result ) {
-            updateLastModified();
+        boolean result;
+        try {
+            ioService.startBatch();
+            result = ioService.deleteIfExists( filePath );
+            if ( result ) {
+                updateLastModified();
+            }
+        } finally {
+            ioService.endBatch();
         }
-        ioService.endBatch();
 
         return result;
     }