Merge pull request #1104 from pzygielo/useless-a

Author: pzygielo

mq/main/mq-broker/persist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/DBTool.java

@@ -1035,7 +1035,7 @@ private void doBackup() throws BrokerException {
 
         logger.logToAll(Logger.INFO, "Backup persistent store for HA cluster " + clusterID);
 
-        FileStore fileStore = new FileStore(backupDir, false);
+        final FileStore fileStore = new FileStore(backupDir, false);
 
         // for backup, need to clear the store before storing anything.
         fileStore.clearAll(false);
@@ -1210,12 +1210,11 @@ private void doBackup() throws BrokerException {
             ex.printStackTrace();
             throw new BrokerException(ex.getMessage());
         } finally {
-            if (fileStore != null) {
-                try {
-                    fileStore.close();
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
+            assert fileStore != null;
+            try {
+                fileStore.close();
+            } catch (Exception e) {
+                e.printStackTrace();
             }
 
             StoreManager.releaseStore(true);
@@ -1238,7 +1237,7 @@ private void doRestore() throws BrokerException {
 
         logger.logToAll(Logger.INFO, "Restore persistent store for HA cluster " + clusterID + " from backup dir: " + backupDir);
 
-        FileStore fileStore = new FileStore(backupDir, false);
+        final FileStore fileStore = new FileStore(backupDir, false);
 
         // Brokers table.
         JDBCStore jdbcStore = null;
@@ -1432,12 +1431,11 @@ private void doRestore() throws BrokerException {
             ex.printStackTrace();
             throw new BrokerException(ex.getMessage());
         } finally {
-            if (fileStore != null) {
-                try {
-                    fileStore.close();
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
+            assert fileStore != null;
+            try {
+                fileStore.close();
+            } catch (Exception e) {
+                e.printStackTrace();
             }
 
             StoreManager.releaseStore(true);