Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit3142078

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 theJDBC list on Friday, explaining why this is being done.Barry Lind
1 parent84587e9 commit3142078

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
<targetname="check_versions">
3939
<availableproperty="jdk1.2+"classname="java.lang.ThreadLocal" />
40-
<availableproperty="jdk1.3+"classname="java.lang.StrictMath" />
4140
<availableproperty="jdk1.2e+"classname="javax.sql.DataSource" />
4241
<availableproperty="junit"classname="junit.framework.Test" />
4342
</target>
@@ -58,11 +57,6 @@
5857
<propertyname="connectclass"value="org.postgresql.jdbc1.Connection" />
5958
<availableproperty="connectclass"value="org.postgresql.jdbc2.Connection"classname="java.lang.ThreadLocal" />
6059

61-
<!-- comment out 1.3+ stuff-->
62-
<propertyname="jdk13only"value="//" />
63-
<availableproperty="jdk13only"value=""classname="java.lang.StrictMath" />
64-
<filtertoken="JDK1.3ONLY"value="${jdk13only}" />
65-
6660
<!-- Some defaults-->
6761
<filtertoken="MAJORVERSION"value="${major}" />
6862
<filtertoken="MINORVERSION"value="${minor}" />
@@ -104,7 +98,6 @@
10498
<targetname="compile"depends="prepare,check_versions,driver">
10599
<javacsrcdir="${src}"destdir="${dest}">
106100
<includename="${package}/**" />
107-
<excludename="${package}/core/ConnectionHook.java"unless="jdk1.3+" />
108101
<excludename="${package}/jdbc1/**"if="jdk1.2+" />
109102
<excludename="${package}/jdbc2/**"unless="jdk1.2+" />
110103
<excludename="${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)

[8]ページ先頭

©2009-2025 Movatter.jp