db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fuzzylo...@apache.org
Subject svn commit: r412957 - in /db/derby/code/trunk/java/client/org/apache/derby/client/am: Configuration.java Connection.java
Date Fri, 09 Jun 2006 07:00:19 GMT
Author: fuzzylogic
Date: Fri Jun  9 00:00:18 2006
New Revision: 412957

URL: http://svn.apache.org/viewvc?rev=412957&view=rev
Log:
DERBY-851: Remove remaining references to org.apache.derby.client.resource
package. Committing patch derby-851-remove-dncresource.diff.

Modified:
    db/derby/code/trunk/java/client/org/apache/derby/client/am/Configuration.java
    db/derby/code/trunk/java/client/org/apache/derby/client/am/Connection.java

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/Configuration.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/Configuration.java?rev=412957&r1=412956&r2=412957&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/Configuration.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/Configuration.java Fri Jun
 9 00:00:18 2006
@@ -131,15 +131,12 @@
     // -----------------------Load resource bundles for the driver asap-----------
 
     private static final String packageNameForDNC = "org.apache.derby.client";
-    private static final String classNameForResources = "org.apache.derby.client.resources.Resources";
 
     public static SqlException exceptionsOnLoadResources = null; // used by ClientDriver
to accumulate load exceptions
-    public static java.util.ResourceBundle dncResources__;
 
     static {
         try {
             loadProductVersionHolder();
-            loadResources();
         } catch (SqlException e) {
             exceptionsOnLoadResources = e;
         }
@@ -166,30 +163,6 @@
             default:
                 break; // state >1, ignore
             }
-        }
-    }
-
-    private static void loadResources() throws SqlException {
-        try {
-            dncResources__ = (java.util.ResourceBundle) java.security.AccessController.doPrivileged(new
org.apache.derby.client.am.GetResourceBundleAction(classNameForResources));
-        } catch (java.security.PrivilegedActionException e) {
-            throw new SqlException(null, 
-                    new ClientMessageId (SQLState.ERROR_PRIVILEGED_ACTION),
-                    e.getException());                    
-        } catch (java.util.MissingResourceException e) {
-            // A null log writer is passed, because jdbc 1 sql exceptions are automatically
traced
-            throw new SqlException(null,
-                    new ClientMessageId (SQLState.MISSING_RESOURCE_BUNDLE),
-                    packageNameForDNC, Configuration.dncDriverName);
-        }
-    }
-
-    public static void checkForExceptionsFromLoadConfiguration(LogWriter dncLogWriter) throws
SqlException {
-        if (dncResources__ == null) {
-             throw new SqlException(null,
-                    new ClientMessageId (SQLState.MISSING_RESOURCE_BUNDLE),
-                    Configuration.packageNameForDNC, 
-                     Configuration.dncDriverName);            
         }
     }
 

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/Connection.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/Connection.java?rev=412957&r1=412956&r2=412957&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/Connection.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/Connection.java Fri Jun  9
00:00:18 2006
@@ -172,7 +172,6 @@
         if (logWriter != null) {
             logWriter.traceConnectEntry(dataSource);
         }
-        org.apache.derby.client.am.Configuration.checkForExceptionsFromLoadConfiguration(logWriter);
 
         user_ = user;
 
@@ -207,7 +206,6 @@
             logWriter.traceConnectEntry(dataSource);
         }
         isXAConnection_ = isXAConn;
-        org.apache.derby.client.am.Configuration.checkForExceptionsFromLoadConfiguration(logWriter);
 
         user_ = ClientDataSource.propertyDefault_user;
 
@@ -308,7 +306,6 @@
         if (logWriter != null) {
             logWriter.traceConnectEntry(serverName, portNumber, databaseName, properties);
         }
-        org.apache.derby.client.am.Configuration.checkForExceptionsFromLoadConfiguration(logWriter);
 
         databaseName_ = databaseName;
 



Mime
View raw message