You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by dj...@apache.org on 2006/08/31 18:15:08 UTC

svn commit: r438972 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting: functionTests/tests/jdbc4/AutoloadTest.java junit/BaseTestCase.java

Author: djd
Date: Thu Aug 31 09:15:07 2006
New Revision: 438972

URL: http://svn.apache.org/viewvc?rev=438972&view=rev
Log:
Clean up some methods in BaseTestCase that were declared to throw PrivilegedActionException but actually had
no code that would do so.

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/AutoloadTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/AutoloadTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/AutoloadTest.java?rev=438972&r1=438971&r2=438972&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/AutoloadTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/AutoloadTest.java Thu Aug 31 09:15:07 2006
@@ -30,7 +30,6 @@
 
 package org.apache.derbyTesting.functionTests.tests.jdbc4;
 
-import java.security.PrivilegedActionException;
 import java.sql.*;
 import java.util.*;
 import junit.framework.*;
@@ -107,7 +106,7 @@
                         autoloadingCurrentDriver = true;
                 }
                 
-            } catch (PrivilegedActionException e) {
+            } catch (SecurityException e) {
                 // can't read property, assume not autoloading.
             }
                         

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java?rev=438972&r1=438971&r2=438972&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java Thu Aug 31 09:15:07 2006
@@ -139,7 +139,7 @@
      */
     protected static void setSystemProperty(final String name, 
 					    final String value)
-	throws PrivilegedActionException {
+    {
 	
 	AccessController.doPrivileged
 	    (new java.security.PrivilegedAction(){
@@ -160,7 +160,7 @@
      * @param name name of the property
      */
     protected static void removeSystemProperty(final String name)
-	throws PrivilegedActionException {
+	{
 	
 	AccessController.doPrivileged
 	    (new java.security.PrivilegedAction(){
@@ -181,7 +181,7 @@
      * @param name name of the property
      */
     protected static String getSystemProperty(final String name)
-	throws PrivilegedActionException {
+	{
 
 	return (String )AccessController.doPrivileged
 	    (new java.security.PrivilegedAction(){
@@ -200,10 +200,9 @@
      * file or a SQL script.
      * @param name Resource name, typically - org.apache.derbyTesing.something
      * @return URL to the resource, null if it does not exist.
-     * @throws PrivilegedActionException
      */
     protected static URL getTestResource(final String name)
-	throws PrivilegedActionException {
+	{
 
 	return (URL)AccessController.doPrivileged
 	    (new java.security.PrivilegedAction(){