db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmars...@apache.org
Subject svn commit: r1070744 - in /db/derby/code/branches/10.6: ./ java/engine/org/apache/derby/jdbc/EmbedPooledConnection.java
Date Tue, 15 Feb 2011 01:56:01 GMT
Author: kmarsden
Date: Tue Feb 15 01:56:00 2011
New Revision: 1070744

URL: http://svn.apache.org/viewvc?rev=1070744&view=rev
Log:
DERBY-4723 Using an instance lock to protect static shared data in EmbedPooledConnection

merge 980089 from trunk
Contributed by Kristian Waagan


Modified:
    db/derby/code/branches/10.6/   (props changed)
    db/derby/code/branches/10.6/java/engine/org/apache/derby/jdbc/EmbedPooledConnection.java

Propchange: db/derby/code/branches/10.6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 15 01:56:00 2011
@@ -1,2 +1,2 @@
-/db/derby/code/trunk:938547,938796,938959,939231,940462,940469,941627,942031,942286,942476,942480,942587,944152,946794,948045,948069,951346,951366,952138,952237,952581,954344,954421,954544,954748,955001,955540,955634,956075,956234,956445,956569,956659,957260,957902,958163,958257,958264,958508,958522,958555,958618,958939,959550,961892,962716,963206,963705,964115,964402,965647,967304,980684,986689,986834,987539,989099,990292,997325,998170,999119,999479,1002291,1002682,1002853,1021426,1025795,1028716,1030043,1033485,1033864,1038514,1040658,1053724,1055169,1062096,1063809,1065061,1067250
+/db/derby/code/trunk:938547,938796,938959,939231,940462,940469,941627,942031,942286,942476,942480,942587,944152,946794,948045,948069,951346,951366,952138,952237,952581,954344,954421,954544,954748,955001,955540,955634,956075,956234,956445,956569,956659,957260,957902,958163,958257,958264,958508,958522,958555,958618,958939,959550,961892,962716,963206,963705,964115,964402,965647,967304,980089,980684,986689,986834,987539,989099,990292,997325,998170,999119,999479,1002291,1002682,1002853,1021426,1025795,1028716,1030043,1033485,1033864,1038514,1040658,1053724,1055169,1062096,1063809,1065061,1067250
 /db/derby/docs/trunk:954344

Modified: db/derby/code/branches/10.6/java/engine/org/apache/derby/jdbc/EmbedPooledConnection.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.6/java/engine/org/apache/derby/jdbc/EmbedPooledConnection.java?rev=1070744&r1=1070743&r2=1070744&view=diff
==============================================================================
--- db/derby/code/branches/10.6/java/engine/org/apache/derby/jdbc/EmbedPooledConnection.java
(original)
+++ db/derby/code/branches/10.6/java/engine/org/apache/derby/jdbc/EmbedPooledConnection.java
Tue Feb 15 01:56:00 2011
@@ -64,13 +64,6 @@ import javax.sql.ConnectionEvent;
  */
 class EmbedPooledConnection implements javax.sql.PooledConnection, BrokeredConnectionControl
 {
-
-    /** Static counter for connection ids */
-    private static int idCounter = 0;
-    
-    /** The id for this connection.  */
-    private int connectionId;
-    
     /** the connection string */
     private String connString;
 
@@ -105,15 +98,8 @@ class EmbedPooledConnection implements j
 
 	protected boolean isActive;
     
-    private synchronized int nextId()
-    {
-        return idCounter++;
-    }
-
 	EmbedPooledConnection(ReferenceableDataSource ds, String u, String p, boolean requestPassword)
throws SQLException
 	{
-        connectionId = nextId();
-
 		dataSource = ds;
 		username = u;
 		password = p;
@@ -560,7 +546,6 @@ class EmbedPooledConnection implements j
             
             connString = 
               this.getClass().getName() + "@" + this.hashCode() + " " +
-                "(ID = " + connectionId + "), " +
                 "Physical Connection = " + physicalConnString;
         }    
         



Mime
View raw message