Fixed some warnings

2 files changed, 93 insertions, 33 deletions

diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBAnnotationsTest.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBAnnotationsTest.java
index b1adeca848..023b9845cb 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBAnnotationsTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBAnnotationsTest.java
@@ -21,6 +21,8 @@ import org.eclipse.emf.cdo.tests.model1.Model1Package;
 import org.eclipse.emf.cdo.transaction.CDOTransaction;
 import org.eclipse.emf.cdo.util.CommitException;
 
+import org.eclipse.net4j.db.DBUtil;
+
 import org.eclipse.emf.ecore.EAnnotation;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
@@ -139,8 +141,16 @@ public class DBAnnotationsTest extends AbstractCDOTest
       {
         String tableName = model1.getName().toUpperCase() + "_PRODUCT1";
         ResultSet rset = getMetaData().getColumns(null, null, tableName, "NAME");
-        rset.next();
-        assertEquals("8", rset.getString(7));
+
+        try
+        {
+          rset.next();
+          assertEquals("8", rset.getString(7));
+        }
+        finally
+        {
+          DBUtil.close(rset);
+        }
       }
     }.verify();
   }
@@ -179,8 +189,16 @@ public class DBAnnotationsTest extends AbstractCDOTest
       {
         String tableName = model1.getName().toUpperCase() + "_CATEGORY";
         ResultSet rset = getMetaData().getColumns(null, null, tableName, "NAME");
-        rset.next();
-        assertEquals("CLOB", rset.getString(6));
+
+        try
+        {
+          rset.next();
+          assertEquals("CLOB", rset.getString(6));
+        }
+        finally
+        {
+          DBUtil.close(rset);
+        }
       }
     }.verify();
   }
@@ -216,8 +234,16 @@ public class DBAnnotationsTest extends AbstractCDOTest
       protected void doVerify() throws Exception
       {
         ResultSet rset = getMetaData().getTables(null, null, "SUBJECT", null);
-        rset.next();
-        assertEquals("SUBJECT", rset.getString(3));
+
+        try
+        {
+          rset.next();
+          assertEquals("SUBJECT", rset.getString(3));
+        }
+        finally
+        {
+          DBUtil.close(rset);
+        }
       }
     }.verify();
   }
@@ -254,8 +280,16 @@ public class DBAnnotationsTest extends AbstractCDOTest
       {
         String tableName = model1.getName().toUpperCase() + "_CATEGORY";
         ResultSet rset = getMetaData().getColumns(null, null, tableName, "TOPIC");
-        rset.next();
-        assertEquals("TOPIC", rset.getString(4));
+
+        try
+        {
+          rset.next();
+          assertEquals("TOPIC", rset.getString(4));
+        }
+        finally
+        {
+          DBUtil.close(rset);
+        }
       }
     }.verify();
   }
@@ -294,9 +328,17 @@ public class DBAnnotationsTest extends AbstractCDOTest
       {
         String tableName = model1.getName().toUpperCase() + "_CATEGORY";
         ResultSet rset = getMetaData().getColumns(null, null, tableName, "TOPIC");
-        rset.next();
-        assertEquals("TOPIC", rset.getString(4));
-        assertEquals("CLOB", rset.getString(6));
+
+        try
+        {
+          rset.next();
+          assertEquals("TOPIC", rset.getString(4));
+          assertEquals("CLOB", rset.getString(6));
+        }
+        finally
+        {
+          DBUtil.close(rset);
+        }
       }
     }.verify();
   }
@@ -333,31 +375,38 @@ public class DBAnnotationsTest extends AbstractCDOTest
       {
         ResultSet rset = getMetaData().getTables(null, null, null, null);
 
-        boolean orderDetailTableCreated = false;
-        boolean companyTableCreated = false;
-        boolean categoryTableCreated = false;
-
-        String prefix = model1.getName().toUpperCase() + '_';
-        while (rset.next())
+        try
         {
-          String tableName = rset.getString(3);
-          if ((prefix + "ORDERDETAIL").equalsIgnoreCase(tableName))
-          {
-            orderDetailTableCreated = true;
-          }
-          else if ((prefix + "COMPANY").equalsIgnoreCase(tableName))
-          {
-            companyTableCreated = true;
-          }
-          else if ((prefix + "CATEGORY").equalsIgnoreCase(tableName))
+          boolean orderDetailTableCreated = false;
+          boolean companyTableCreated = false;
+          boolean categoryTableCreated = false;
+
+          String prefix = model1.getName().toUpperCase() + '_';
+          while (rset.next())
           {
-            categoryTableCreated = true;
+            String tableName = rset.getString(3);
+            if ((prefix + "ORDERDETAIL").equalsIgnoreCase(tableName))
+            {
+              orderDetailTableCreated = true;
+            }
+            else if ((prefix + "COMPANY").equalsIgnoreCase(tableName))
+            {
+              companyTableCreated = true;
+            }
+            else if ((prefix + "CATEGORY").equalsIgnoreCase(tableName))
+            {
+              categoryTableCreated = true;
+            }
           }
-        }
 
-        assertEquals(false, orderDetailTableCreated);
-        assertEquals(false, companyTableCreated);
-        assertEquals(true, categoryTableCreated);
+          assertEquals(false, orderDetailTableCreated);
+          assertEquals(false, companyTableCreated);
+          assertEquals(true, categoryTableCreated);
+        }
+        finally
+        {
+          DBUtil.close(rset);
+        }
       }
     }.verify();
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/capabilities/AbstractCapabilityTest.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/capabilities/AbstractCapabilityTest.java
index 4d1693ca52..c261281a88 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/capabilities/AbstractCapabilityTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/capabilities/AbstractCapabilityTest.java
@@ -10,6 +10,7 @@
  */
 package org.eclipse.emf.cdo.tests.db.capabilities;
 
+import org.eclipse.net4j.db.DBUtil;
 import org.eclipse.net4j.db.IDBConnectionProvider;
 
 import java.sql.Connection;
@@ -48,6 +49,8 @@ public abstract class AbstractCapabilityTest extends TestCase
           IDBConnectionProvider provider = getConnectionProvider();
           Connection transaction1 = provider.getConnection();
           transaction1.setAutoCommit(false);
+
+          @SuppressWarnings("resource")
           Statement tx1stmt = transaction1.createStatement();
           tx1stmt.executeUpdate("update status_table set status = 'changed' where trans = 'transaction1'");
           msg("Read value (transaction 1) is "
@@ -91,7 +94,15 @@ public abstract class AbstractCapabilityTest extends TestCase
     transaction1.setAutoCommit(false);
 
     Statement tx1stmt = transaction1.createStatement();
-    tx1stmt.executeUpdate("update status_table set status = 'changed' where trans = 'transaction1'");
+
+    try
+    {
+      tx1stmt.executeUpdate("update status_table set status = 'changed' where trans = 'transaction1'");
+    }
+    finally
+    {
+      DBUtil.close(tx1stmt);
+    }
 
     msg("Read value before rollback is "
         + select(transaction1, "select status from status_table where trans = 'transaction1'").toUpperCase());