You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by mb...@apache.org on 2022/07/16 22:47:18 UTC
[db-jdo] 02/07: JDO-817 removing compiler warnings: empty catch block, empty finally, throw inside finally
This is an automated email from the ASF dual-hosted git repository.
mbo pushed a commit to branch tck-compiler-warnings
in repository https://gitbox.apache.org/repos/asf/db-jdo.git
commit 21d7a0c8d4d6873f3924197051168e16d026953e
Author: Michael Bouschen <Mi...@akquinet.de>
AuthorDate: Sat Jul 16 22:44:46 2022 +0200
JDO-817 removing compiler warnings: empty catch block, empty finally, throw inside finally
---
.../api/persistencemanager/DatastoreTimeout.java | 64 ++++++++++----------
.../persistencemanagerfactory/GetPMFByStream.java | 1 +
.../GetPMFByStreamAndClassLoader.java | 1 +
...nstancesDeletedPriorToIterationNotReturned.java | 44 +++++++-------
...InstancesPersistedPriorToIterationReturned.java | 42 ++++++-------
.../IteratorHasNextFalseAfterExtentClose.java | 70 ++++++++++------------
.../jdo/tck/extents/IteratorMutatingMethods.java | 2 -
.../apache/jdo/tck/lifecycle/StateTransitions.java | 1 +
.../lifecycle/StateTransitionsReturnedObjects.java | 1 +
.../models/fieldtypes/TestArrayCollections.java | 2 +-
...sistenceManagerFromRestoredSerializedQuery.java | 4 +-
.../jdo/tck/query/api/InvalidNamedQuery.java | 2 +-
.../jdo/tck/query/api/NamedQueryNotFound.java | 2 +-
.../api/NewQueryFromRestoredSerializedQuery.java | 4 +-
.../org/apache/jdo/tck/query/api/SetResult.java | 2 +-
.../jdo/tck/query/api/UnmodifiableQuery.java | 16 ++---
...gMultipleQueriesSimultaneouslyIsThreadSafe.java | 2 +-
.../jdo/tck/query/jdoql/QueryIsSerializable.java | 6 +-
.../jdo/tck/query/sql/AllowedAPIMethods.java | 14 ++---
.../java/org/apache/jdo/tck/util/RogueBarrier.java | 2 +-
.../org/apache/jdo/tck/util/TCKFileHandler.java | 8 +--
21 files changed, 140 insertions(+), 150 deletions(-)
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DatastoreTimeout.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DatastoreTimeout.java
index b71de5ad..66dccc8e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DatastoreTimeout.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DatastoreTimeout.java
@@ -110,14 +110,14 @@ public class DatastoreTimeout extends JDO_Test {
}
finally {
t.join();
- Throwable problem = group.getUncaughtException(t);
- if (problem != null) {
- if (problem instanceof AssertionFailedError)
- throw (AssertionFailedError)problem;
- else
- throw new JDOFatalException( "Thread " + t.getName()+
- " results in exception ", problem);
- }
+ }
+ Throwable problem = group.getUncaughtException(t);
+ if (problem != null) {
+ if (problem instanceof AssertionFailedError)
+ throw (AssertionFailedError)problem;
+ else
+ throw new JDOFatalException( "Thread " + t.getName()+
+ " results in exception ", problem);
}
}
@@ -145,14 +145,14 @@ public class DatastoreTimeout extends JDO_Test {
}
finally {
t.join();
- Throwable problem = group.getUncaughtException(t);
- if (problem != null) {
- if (problem instanceof AssertionFailedError)
- throw (AssertionFailedError)problem;
- else
- throw new JDOFatalException( "Thread " + t.getName()+
- " results in exception ", problem);
- }
+ }
+ Throwable problem = group.getUncaughtException(t);
+ if (problem != null) {
+ if (problem instanceof AssertionFailedError)
+ throw (AssertionFailedError)problem;
+ else
+ throw new JDOFatalException( "Thread " + t.getName()+
+ " results in exception ", problem);
}
}
@@ -176,14 +176,14 @@ public class DatastoreTimeout extends JDO_Test {
}
finally {
t.join();
- Throwable problem = group.getUncaughtException(t);
- if (problem != null) {
- if (problem instanceof AssertionFailedError)
- throw (AssertionFailedError)problem;
- else
- throw new JDOFatalException( "Thread " + t.getName()+
- " results in exception ", problem);
- }
+ }
+ Throwable problem = group.getUncaughtException(t);
+ if (problem != null) {
+ if (problem instanceof AssertionFailedError)
+ throw (AssertionFailedError)problem;
+ else
+ throw new JDOFatalException( "Thread " + t.getName()+
+ " results in exception ", problem);
}
}
@@ -207,14 +207,14 @@ public class DatastoreTimeout extends JDO_Test {
}
finally {
t.join();
- Throwable problem = group.getUncaughtException(t);
- if (problem != null) {
- if (problem instanceof AssertionFailedError)
- throw (AssertionFailedError)problem;
- else
- throw new JDOFatalException( "Thread " + t.getName()+
- " results in exception ", problem);
- }
+ }
+ Throwable problem = group.getUncaughtException(t);
+ if (problem != null) {
+ if (problem instanceof AssertionFailedError)
+ throw (AssertionFailedError)problem;
+ else
+ throw new JDOFatalException( "Thread " + t.getName()+
+ " results in exception ", problem);
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPMFByStream.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPMFByStream.java
index 40d72121..78b90d3a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPMFByStream.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPMFByStream.java
@@ -75,6 +75,7 @@ public class GetPMFByStream extends AbstractGetPMF {
}
/** */
+ @SuppressWarnings("ThrowFromFinallyBlock")
protected PersistenceManagerFactory getPMF(String name) {
FileInputStream stream = null;
try {
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPMFByStreamAndClassLoader.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPMFByStreamAndClassLoader.java
index 75fb894a..6c588b3d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPMFByStreamAndClassLoader.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPMFByStreamAndClassLoader.java
@@ -75,6 +75,7 @@ public class GetPMFByStreamAndClassLoader extends AbstractGetPMF {
}
/** */
+ @SuppressWarnings("ThrowFromFinallyBlock")
protected PersistenceManagerFactory getPMF(String name) {
FileInputStream stream = null;
try {
diff --git a/tck/src/main/java/org/apache/jdo/tck/extents/InstancesDeletedPriorToIterationNotReturned.java b/tck/src/main/java/org/apache/jdo/tck/extents/InstancesDeletedPriorToIterationNotReturned.java
index 6724eb85..94e39b0c 100644
--- a/tck/src/main/java/org/apache/jdo/tck/extents/InstancesDeletedPriorToIterationNotReturned.java
+++ b/tck/src/main/java/org/apache/jdo/tck/extents/InstancesDeletedPriorToIterationNotReturned.java
@@ -56,31 +56,27 @@ public class InstancesDeletedPriorToIterationNotReturned extends ExtentTest {
/** */
public void test() {
- try {
- beginTransaction();
- getPM().setIgnoreCache(false);
- Extent<Employee> ex = getPM().getExtent (Employee.class, true);
- Iterator<Employee> it1 = ex.iterator();
- deleteEmployee(it1.next());
- Iterator<Employee> it2 = ex.iterator();
- int count = countIterator(it2);
- rollbackTransaction();
+ beginTransaction();
+ getPM().setIgnoreCache(false);
+ Extent<Employee> ex = getPM().getExtent (Employee.class, true);
+ Iterator<Employee> it1 = ex.iterator();
+ deleteEmployee(it1.next());
+ Iterator<Employee> it2 = ex.iterator();
+ int count = countIterator(it2);
+ rollbackTransaction();
- beginTransaction();
- Iterator<Employee> it3 = ex.iterator();
- int count3 = countIterator(it3);
- commitTransaction();
-
- if (count != 1) {
- fail(ASSERTION_FAILED,
- "counted " + count + " after delete; should be 1");
- }
- if (count3 != 2) {
- fail(ASSERTION_FAILED,
- "counted " + count3 + "after rollback; should be 2");
- }
- }
- finally {
+ beginTransaction();
+ Iterator<Employee> it3 = ex.iterator();
+ int count3 = countIterator(it3);
+ commitTransaction();
+
+ if (count != 1) {
+ fail(ASSERTION_FAILED,
+ "counted " + count + " after delete; should be 1");
+ }
+ if (count3 != 2) {
+ fail(ASSERTION_FAILED,
+ "counted " + count3 + "after rollback; should be 2");
}
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/extents/InstancesPersistedPriorToIterationReturned.java b/tck/src/main/java/org/apache/jdo/tck/extents/InstancesPersistedPriorToIterationReturned.java
index 68bd5ecc..ef1744ea 100644
--- a/tck/src/main/java/org/apache/jdo/tck/extents/InstancesPersistedPriorToIterationReturned.java
+++ b/tck/src/main/java/org/apache/jdo/tck/extents/InstancesPersistedPriorToIterationReturned.java
@@ -57,30 +57,26 @@ public class InstancesPersistedPriorToIterationReturned extends ExtentTest {
/** */
public void test() {
- try {
- beginTransaction();
- getPM().setIgnoreCache(false);
- Extent<Employee> ex = getPM().getExtent (Employee.class, true);
- addEmployee();
- Iterator<Employee> it = ex.iterator();
- int count = countIterator(it);
- rollbackTransaction();
+ beginTransaction();
+ getPM().setIgnoreCache(false);
+ Extent<Employee> ex = getPM().getExtent (Employee.class, true);
+ addEmployee();
+ Iterator<Employee> it = ex.iterator();
+ int count = countIterator(it);
+ rollbackTransaction();
- beginTransaction();
- Iterator<Employee> it2 = ex.iterator();
- int count2 = countIterator(it2);
- commitTransaction();
-
- if (count != 3) {
- fail(ASSERTION_FAILED,
- "Iterator: " + count + " should be 3");
- }
- if (count2 != 2) {
- fail(ASSERTION_FAILED,
- "Iterator2: " + count2 + "should be 2");
- }
- }
- finally {
+ beginTransaction();
+ Iterator<Employee> it2 = ex.iterator();
+ int count2 = countIterator(it2);
+ commitTransaction();
+
+ if (count != 3) {
+ fail(ASSERTION_FAILED,
+ "Iterator: " + count + " should be 3");
+ }
+ if (count2 != 2) {
+ fail(ASSERTION_FAILED,
+ "Iterator2: " + count2 + "should be 2");
}
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/extents/IteratorHasNextFalseAfterExtentClose.java b/tck/src/main/java/org/apache/jdo/tck/extents/IteratorHasNextFalseAfterExtentClose.java
index 037556f5..9b2ca8ca 100644
--- a/tck/src/main/java/org/apache/jdo/tck/extents/IteratorHasNextFalseAfterExtentClose.java
+++ b/tck/src/main/java/org/apache/jdo/tck/extents/IteratorHasNextFalseAfterExtentClose.java
@@ -57,43 +57,39 @@ public class IteratorHasNextFalseAfterExtentClose extends ExtentTest {
/** */
public void test() {
- try {
- beginTransaction();
- Extent<Employee> ex = getPM().getExtent (Employee.class, true);
- Iterator<Employee> it1 = ex.iterator();
- deleteEmployee(it1.next());
- Iterator<Employee> it2 = ex.iterator();
- addEmployee();
- Iterator<Employee> it3 = ex.iterator();
- ex.close(it1);
- ex.close(it2);
- ex.close(it3);
- rollbackTransaction();
-
- beginTransaction();
- Iterator<Employee> it4 = ex.iterator();
- int count4 = countIterator(it4);
- rollbackTransaction();
- if (debug) logger.debug ("Iterator4 after rollback: " + count4);
-
- if (it1.hasNext()) {
- fail(ASSERTION_FAILED,
- "iterator1.hasNext(): " + it1.hasNext());
- }
- if (it2.hasNext()) {
- fail(ASSERTION_FAILED,
- "iterator2.hasNext(): " + it2.hasNext());
- }
- if (it3.hasNext()) {
- fail(ASSERTION_FAILED,
- "iterator3.hasNext(): " + it3.hasNext());
- }
- if (count4 != 2) {
- fail(ASSERTION_FAILED,
- "Iterator " + count4 + " should be 2");
- }
- }
- finally {
+ beginTransaction();
+ Extent<Employee> ex = getPM().getExtent (Employee.class, true);
+ Iterator<Employee> it1 = ex.iterator();
+ deleteEmployee(it1.next());
+ Iterator<Employee> it2 = ex.iterator();
+ addEmployee();
+ Iterator<Employee> it3 = ex.iterator();
+ ex.close(it1);
+ ex.close(it2);
+ ex.close(it3);
+ rollbackTransaction();
+
+ beginTransaction();
+ Iterator<Employee> it4 = ex.iterator();
+ int count4 = countIterator(it4);
+ rollbackTransaction();
+ if (debug) logger.debug ("Iterator4 after rollback: " + count4);
+
+ if (it1.hasNext()) {
+ fail(ASSERTION_FAILED,
+ "iterator1.hasNext(): " + it1.hasNext());
+ }
+ if (it2.hasNext()) {
+ fail(ASSERTION_FAILED,
+ "iterator2.hasNext(): " + it2.hasNext());
+ }
+ if (it3.hasNext()) {
+ fail(ASSERTION_FAILED,
+ "iterator3.hasNext(): " + it3.hasNext());
+ }
+ if (count4 != 2) {
+ fail(ASSERTION_FAILED,
+ "Iterator " + count4 + " should be 2");
}
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/extents/IteratorMutatingMethods.java b/tck/src/main/java/org/apache/jdo/tck/extents/IteratorMutatingMethods.java
index 6da34982..81803d5a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/extents/IteratorMutatingMethods.java
+++ b/tck/src/main/java/org/apache/jdo/tck/extents/IteratorMutatingMethods.java
@@ -67,8 +67,6 @@ public class IteratorMutatingMethods extends ExtentTest {
catch (UnsupportedOperationException expected) {
// expected exception
if (debug) logger.debug("expected exception " + ex);
- }
- finally {
}
commitTransaction();
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/lifecycle/StateTransitions.java b/tck/src/main/java/org/apache/jdo/tck/lifecycle/StateTransitions.java
index 2aec08e9..650418ff 100644
--- a/tck/src/main/java/org/apache/jdo/tck/lifecycle/StateTransitions.java
+++ b/tck/src/main/java/org/apache/jdo/tck/lifecycle/StateTransitions.java
@@ -617,6 +617,7 @@ public class StateTransitions extends JDO_Test {
}
/** */
+ @SuppressWarnings("ThrowFromFinallyBlock")
void applyOperation(int operation, StateTransitionObj stobj)
{
StateTransitionObj obj = stobj;
diff --git a/tck/src/main/java/org/apache/jdo/tck/lifecycle/StateTransitionsReturnedObjects.java b/tck/src/main/java/org/apache/jdo/tck/lifecycle/StateTransitionsReturnedObjects.java
index 732c3084..5bdcc2c0 100644
--- a/tck/src/main/java/org/apache/jdo/tck/lifecycle/StateTransitionsReturnedObjects.java
+++ b/tck/src/main/java/org/apache/jdo/tck/lifecycle/StateTransitionsReturnedObjects.java
@@ -392,6 +392,7 @@ public class StateTransitionsReturnedObjects extends JDO_Test {
}
/** */
+ @SuppressWarnings("ThrowFromFinallyBlock")
Object applyOperation(int operation, StateTransitionObj stobj)
{
Object result = null;
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestArrayCollections.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestArrayCollections.java
index 7af31717..5eb51b98 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestArrayCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestArrayCollections.java
@@ -139,7 +139,7 @@ public class TestArrayCollections extends JDO_Test {
try {
// get the right class to instantiate
vectorClass = value.get(0).getClass();
- } catch (Exception e) {
+ } catch (Exception ignored) {
}
Object[] valueArray = (Object[])Array.newInstance(vectorClass,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/GetPersistenceManagerFromRestoredSerializedQuery.java b/tck/src/main/java/org/apache/jdo/tck/query/api/GetPersistenceManagerFromRestoredSerializedQuery.java
index d5263a0e..ae61404d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/GetPersistenceManagerFromRestoredSerializedQuery.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/GetPersistenceManagerFromRestoredSerializedQuery.java
@@ -88,7 +88,7 @@ public class GetPersistenceManagerFromRestoredSerializedQuery
}
finally {
if (oos != null) {
- try { oos.close();} catch(Exception ex) {}
+ try { oos.close();} catch(Exception ignored) {}
}
}
}
@@ -117,7 +117,7 @@ public class GetPersistenceManagerFromRestoredSerializedQuery
}
finally {
if (ois != null) {
- try { ois.close(); } catch(Exception ex) {}
+ try { ois.close(); } catch(Exception ignored) {}
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/InvalidNamedQuery.java b/tck/src/main/java/org/apache/jdo/tck/query/api/InvalidNamedQuery.java
index 16e1930c..c2cb07ef 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/InvalidNamedQuery.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/InvalidNamedQuery.java
@@ -55,7 +55,7 @@ public class InvalidNamedQuery extends QueryTest {
getPM().newNamedQuery(Person.class, "invalidQuery");
fail(ASSERTION_FAILED + "Lookup of named query 'invalidQuery' " +
" succeeded, though the query is not compilable.");
- } catch (JDOUserException e) {
+ } catch (JDOUserException ignored) {
}
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/NamedQueryNotFound.java b/tck/src/main/java/org/apache/jdo/tck/query/api/NamedQueryNotFound.java
index 40c3ad20..f8d0a3ab 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/NamedQueryNotFound.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/NamedQueryNotFound.java
@@ -55,7 +55,7 @@ public class NamedQueryNotFound extends QueryTest {
fail(ASSERTION_FAILED +
"The lookup of named query 'nonExistingNamedQuery' " +
"is successful, though that named query is undefined.");
- } catch (JDOUserException e) {
+ } catch (JDOUserException ignored) {
}
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryFromRestoredSerializedQuery.java b/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryFromRestoredSerializedQuery.java
index 9332d59f..28de226a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryFromRestoredSerializedQuery.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryFromRestoredSerializedQuery.java
@@ -87,8 +87,8 @@ public class NewQueryFromRestoredSerializedQuery extends QueryTest {
}
finally {
if (oos != null) {
- try { oos.flush();} catch(Exception ex) {}
- try { oos.close();} catch(Exception ex) {}
+ try { oos.flush();} catch(Exception ignored) {}
+ try { oos.close();} catch(Exception ignored) {}
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/SetResult.java b/tck/src/main/java/org/apache/jdo/tck/query/api/SetResult.java
index e77b84ab..f75573cd 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/SetResult.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/SetResult.java
@@ -79,7 +79,7 @@ public class SetResult extends QueryTest {
fail(ASSERTION_FAILED + "Compilation for query " +
"'SELECT noname FROM Person' " +
"succeeded, though the result clause is invalid.");
- } catch (JDOUserException e) {
+ } catch (JDOUserException ignored) {
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/UnmodifiableQuery.java b/tck/src/main/java/org/apache/jdo/tck/query/api/UnmodifiableQuery.java
index 6c08e8f2..c3f62ca7 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/UnmodifiableQuery.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/UnmodifiableQuery.java
@@ -116,7 +116,7 @@ public class UnmodifiableQuery extends QueryTest {
try {
query.setResult("firstname, lastname");
methodFailed("setResult()");
- } catch (JDOUserException e) {
+ } catch (JDOUserException ignored) {
}
}
@@ -124,7 +124,7 @@ public class UnmodifiableQuery extends QueryTest {
try {
query.setClass(Employee.class);
methodFailed("setClass()");
- } catch (JDOUserException e) {
+ } catch (JDOUserException ignored) {
}
}
@@ -132,7 +132,7 @@ public class UnmodifiableQuery extends QueryTest {
try {
query.setFilter("firstname == 'emp1First'");
methodFailed("setFilter()");
- } catch (JDOUserException e) {
+ } catch (JDOUserException ignored) {
}
}
@@ -140,7 +140,7 @@ public class UnmodifiableQuery extends QueryTest {
try {
query.declareVariables("Employee emp");
methodFailed("declareVariables()");
- } catch (JDOUserException e) {
+ } catch (JDOUserException ignored) {
}
}
@@ -148,7 +148,7 @@ public class UnmodifiableQuery extends QueryTest {
try {
query.declareParameters("Employee emp");
methodFailed("declareParameters()");
- } catch (JDOUserException e) {
+ } catch (JDOUserException ignored) {
}
}
@@ -156,7 +156,7 @@ public class UnmodifiableQuery extends QueryTest {
try {
query.declareImports("import org.apache.jdo.tck.pc.company.Employee");
methodFailed("declareImports()");
- } catch (JDOUserException e) {
+ } catch (JDOUserException ignored) {
}
}
@@ -164,7 +164,7 @@ public class UnmodifiableQuery extends QueryTest {
try {
query.setGrouping("firstname");
methodFailed("setGrouping()");
- } catch (JDOUserException e) {
+ } catch (JDOUserException ignored) {
}
}
@@ -172,7 +172,7 @@ public class UnmodifiableQuery extends QueryTest {
try {
query.setOrdering("firstname ASCENDING");
methodFailed("setOrdering()");
- } catch (JDOUserException e) {
+ } catch (JDOUserException ignored) {
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/ExecutingMultipleQueriesSimultaneouslyIsThreadSafe.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/ExecutingMultipleQueriesSimultaneouslyIsThreadSafe.java
index c916d619..5bd65511 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/ExecutingMultipleQueriesSimultaneouslyIsThreadSafe.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/ExecutingMultipleQueriesSimultaneouslyIsThreadSafe.java
@@ -92,7 +92,7 @@ public class ExecutingMultipleQueriesSimultaneouslyIsThreadSafe
": Waiting for threads to join...");
for (int i = 0; i < NR_OF_THREADS; i++) {
try { threads[i].join(); }
- catch (InterruptedException e) { }
+ catch (InterruptedException ignored) { }
}
if (debug) logger.debug(getThreadName() + ": All threads joined.");
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/QueryIsSerializable.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/QueryIsSerializable.java
index 75f9f7d0..1822827b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/QueryIsSerializable.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/QueryIsSerializable.java
@@ -125,8 +125,8 @@ public class QueryIsSerializable extends QueryTest {
}
finally {
if (oos != null) {
- try { oos.flush();} catch(Exception ex) {}
- try { oos.close();} catch(Exception ex) {}
+ try { oos.flush();} catch(Exception ignored) {}
+ try { oos.close();} catch(Exception ignored) {}
}
}
@@ -152,7 +152,7 @@ public class QueryIsSerializable extends QueryTest {
if (debug) logger.debug("Query object restored.");
} finally {
if (ois != null) {
- try { ois.close();} catch(Exception ex) {}
+ try { ois.close();} catch(Exception ignored) {}
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/sql/AllowedAPIMethods.java b/tck/src/main/java/org/apache/jdo/tck/query/sql/AllowedAPIMethods.java
index 26127fc5..a9c06b0c 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/sql/AllowedAPIMethods.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/sql/AllowedAPIMethods.java
@@ -158,7 +158,7 @@ public class AllowedAPIMethods extends QueryTest {
try {
query.setResult("firstname, lastname");
methodFailed("setResult()");
- } catch (JDOUserException e) {
+ } catch (JDOUserException ignored) {
}
}
@@ -166,7 +166,7 @@ public class AllowedAPIMethods extends QueryTest {
try {
query.setFilter("WHERE personid = 1");
methodFailed("setFilter()");
- } catch (JDOUserException e) {
+ } catch (JDOUserException ignored) {
}
}
@@ -174,7 +174,7 @@ public class AllowedAPIMethods extends QueryTest {
try {
query.declareVariables("Employee emp");
methodFailed("declareVariables()");
- } catch (JDOUserException e) {
+ } catch (JDOUserException ignored) {
}
}
@@ -182,7 +182,7 @@ public class AllowedAPIMethods extends QueryTest {
try {
query.declareParameters("Employee emp");
methodFailed("declareParameters()");
- } catch (JDOUserException e) {
+ } catch (JDOUserException ignored) {
}
}
@@ -190,7 +190,7 @@ public class AllowedAPIMethods extends QueryTest {
try {
query.declareImports("import org.apache.jdo.tck.pc.company.Employee");
methodFailed("declareImports()");
- } catch (JDOUserException e) {
+ } catch (JDOUserException ignored) {
}
}
@@ -198,7 +198,7 @@ public class AllowedAPIMethods extends QueryTest {
try {
query.setGrouping("firstname");
methodFailed("setGrouping()");
- } catch (JDOUserException e) {
+ } catch (JDOUserException ignored) {
}
}
@@ -206,7 +206,7 @@ public class AllowedAPIMethods extends QueryTest {
try {
query.setOrdering("firstname ASCENDING");
methodFailed("setOrdering()");
- } catch (JDOUserException e) {
+ } catch (JDOUserException ignored) {
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/util/RogueBarrier.java b/tck/src/main/java/org/apache/jdo/tck/util/RogueBarrier.java
index e6b40395..204d1a8a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/util/RogueBarrier.java
+++ b/tck/src/main/java/org/apache/jdo/tck/util/RogueBarrier.java
@@ -152,7 +152,7 @@ public class RogueBarrier {
try {
threads[i].join();
break;
- } catch (InterruptedException e) {
+ } catch (InterruptedException ignored) {
}
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/util/TCKFileHandler.java b/tck/src/main/java/org/apache/jdo/tck/util/TCKFileHandler.java
index a0e4a772..94a2e75b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/util/TCKFileHandler.java
+++ b/tck/src/main/java/org/apache/jdo/tck/util/TCKFileHandler.java
@@ -269,7 +269,7 @@ public class TCKFileHandler extends Handler {
} catch (Exception e) {
try {
setEncoding(defaultEncoding);
- } catch (Exception ex) {
+ } catch (Exception ignored) {
}
}
}
@@ -281,7 +281,7 @@ public class TCKFileHandler extends Handler {
if ( value != null) {
try {
result = Boolean.valueOf(value.trim()).booleanValue();
- } catch (Exception ex) {
+ } catch (Exception ignored) {
}
}
return result;
@@ -304,7 +304,7 @@ public class TCKFileHandler extends Handler {
if (value != null) {
try {
result = Level.parse(value.trim());
- } catch (Exception ex) {
+ } catch (Exception ignored) {
}
}
return result;
@@ -329,7 +329,7 @@ public class TCKFileHandler extends Handler {
Class<?> clazz =
ClassLoader.getSystemClassLoader().loadClass(value);
result = clazz.newInstance();
- } catch (Exception ex) {
+ } catch (Exception ignored) {
}
}
return result;