Index: JdbcOdbcDriver.java
===================================================================
--- jdk/src/closed/share/classes/sun/jdbc/odbc/JdbcOdbcDriver.java (https://arena.hursley.ibm.com/mustang/levels/8-b25) (revision 638)
+++ jdk/src/closed/share/classes/sun/jdbc/odbc/JdbcOdbcDriver.java (working copy)
@@ -93,8 +93,8 @@
 
         protected synchronized void finalize ()
         {
- if (OdbcApi.getTracer().isTracing ()) {
- OdbcApi.getTracer().trace ("Driver.finalize");
+ if (tracer.isTracing ()) {
+ tracer.trace ("Driver.finalize");
                 }
 
                 try {
@@ -450,8 +450,8 @@
                                     new sun.security.action.GetPropertyAction("file.encoding"));
                         }
                         catch (Exception ex) {
- if (OdbcApi.getTracer().isTracing ()) {
- OdbcApi.getTracer().trace ("Unable to load JdbcOdbc library");
+ if (tracer.isTracing ()) {
+ tracer.trace ("Unable to load JdbcOdbc library");
                                 }
                                 rc = false;
                         }
@@ -459,7 +459,7 @@
 
                 // RFE 4641013
                 if(getWriter() != null){
- OdbcApi.getTracer().setWriter(getWriter());
+ tracer.setWriter(getWriter());
                 }
 
                 // Allocate an environment handle for the driver
@@ -469,8 +469,8 @@
                                 hEnv = OdbcApi.SQLAllocEnv ();
                         }
                         catch (Exception ex) {
- if (OdbcApi.getTracer().isTracing ()) {
- OdbcApi.getTracer().trace ("Unable to allocate environment");
+ if (tracer.isTracing ()) {
+ tracer.trace ("Unable to allocate environment");
                                 }
                                 rc = false;
                         }