Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 3142078

Browse files
committed
Attached is a patch to remove the ConnectionHook functionality and thus
the JDK 1.3 dependency. For a further explanation see my posting to the JDBC list on Friday, explaining why this is being done. Barry Lind
1 parent 84587e9 commit 3142078

File tree

2 files changed

+1
-11
lines changed

2 files changed

+1
-11
lines changed

src/interfaces/jdbc/build.xml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
build file to allow ant (http://jakarta.apache.org/ant/) to be used
44
to build the PostgreSQL JDBC Driver.
55
6-
$Id: build.xml,v 1.15 2001/05/25 16:29:17 momjian Exp $
6+
$Id: build.xml,v 1.16 2001/07/04 15:07:54 momjian Exp $
77
88
-->
99

@@ -37,7 +37,6 @@
3737
-->
3838
<target name="check_versions">
3939
<available property="jdk1.2+" classname="java.lang.ThreadLocal" />
40-
<available property="jdk1.3+" classname="java.lang.StrictMath" />
4140
<available property="jdk1.2e+" classname="javax.sql.DataSource" />
4241
<available property="junit" classname="junit.framework.Test" />
4342
</target>
@@ -58,11 +57,6 @@
5857
<property name="connectclass" value="org.postgresql.jdbc1.Connection" />
5958
<available property="connectclass" value="org.postgresql.jdbc2.Connection" classname="java.lang.ThreadLocal" />
6059

61-
<!-- comment out 1.3+ stuff -->
62-
<property name="jdk13only" value="//" />
63-
<available property="jdk13only" value="" classname="java.lang.StrictMath" />
64-
<filter token="JDK1.3ONLY" value="${jdk13only}" />
65-
6660
<!-- Some defaults -->
6761
<filter token="MAJORVERSION" value="${major}" />
6862
<filter token="MINORVERSION" value="${minor}" />
@@ -104,7 +98,6 @@
10498
<target name="compile" depends="prepare,check_versions,driver">
10599
<javac srcdir="${src}" destdir="${dest}">
106100
<include name="${package}/**" />
107-
<exclude name="${package}/core/ConnectionHook.java" unless="jdk1.3+" />
108101
<exclude name="${package}/jdbc1/**" if="jdk1.2+" />
109102
<exclude name="${package}/jdbc2/**" unless="jdk1.2+" />
110103
<exclude name="${package}/largeobject/PGblob.java" unless="jdk1.2+" />

src/interfaces/jdbc/org/postgresql/Driver.java.in

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@ public class Driver implements java.sql.Driver
3636
// Placing it here, means that the driver is registered once only.
3737
java.sql.DriverManager.registerDriver(new Driver());
3838

39-
// New in 7.1 - register ourselves with the JVM - JDK1.3+ only
40-
@JDK1.3ONLY@org.postgresql.core.ConnectionHook.init();
41-
4239
} catch (SQLException e) {
4340
e.printStackTrace();
4441
}

0 commit comments

Comments
 (0)