db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From krist...@apache.org
Subject svn commit: r1298750 - in /db/derby/code/branches/10.5: ./ java/ java/engine/org/apache/derby/impl/jdbc/EmbedConnection.java
Date Fri, 09 Mar 2012 08:32:38 GMT
Author: kristwaa
Date: Fri Mar  9 08:32:37 2012
New Revision: 1298750

URL: http://svn.apache.org/viewvc?rev=1298750&view=rev
Log:
DERBY-5603: EmbedConnection.clearLOBMapping() incorrectly clears lobFiles causing a ConcurrentModificationException

Merged fix from trunk (revision 1294512).

Modified:
    db/derby/code/branches/10.5/   (props changed)
    db/derby/code/branches/10.5/java/   (props changed)
    db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/jdbc/EmbedConnection.java

Propchange: db/derby/code/branches/10.5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar  9 08:32:37 2012
@@ -1,4 +1,4 @@
 /db/derby/code/branches/10.6:942027,957000,957287,958621,962738,965351,987678,997790*,1031623,1055601,1068474,1071167
 /db/derby/code/branches/10.7:1294731
 /db/derby/code/branches/10.8:1209227-1209228,1209284
-/db/derby/code/trunk:757811,764912,769596,769602,769606,769962,772090,772337,772449,772534,774281,777105,779681,782991,785131,785139,785163,785570,785662,788369,788670,788674,788968,789264,790218,791027,792001,792254,792434,793089,793588,794106,794276,794303,794955,795166,795459,796020,796027,796316,796372,797147,798347,798742,800523,803336,803548,803948,805696,808494,808850,809643,810860,812669,816531,816536,819006,822289,823659,824694,826263,827505,829022,829410,830545,831304,831319,832379,833430,835286,881074,881444,882732,884163,885421,885659,887246,888311,891350,892912,897161,898635,901165,901648,901760,902857,903108,905224,908418,908586,909176,910481,910511,911315,911793,915177,915733,916075,916897,917771,918152,918359,921028,927430,928065,929085,931076,934474,936215,938959,940462,940469,942286,942476,942480,942587,946794,948045,948069,951346,951366,952138,952237,952581,954748,955001,955634,956075,956445,956659,957260,958163,958618,959550,961892,962716,964039,964402,96
 5647,966393,967201,967304,980089,980684,986689,986834,987539,989099,997325*,998170,999119,999485,1002291,1002682,1002853,1021426,1024511,1024528,1025615,1025795,1030043,1040658,1053724,1055169,1062096,1063809,1065061,1067250,1069661,1071886,1081455,1085078,1136363,1138341,1138444,1141924,1203050,1207729,1208775,1293494
+/db/derby/code/trunk:757811,764912,769596,769602,769606,769962,772090,772337,772449,772534,774281,777105,779681,782991,785131,785139,785163,785570,785662,788369,788670,788674,788968,789264,790218,791027,792001,792254,792434,793089,793588,794106,794276,794303,794955,795166,795459,796020,796027,796316,796372,797147,798347,798742,800523,803336,803548,803948,805696,808494,808850,809643,810860,812669,816531,816536,819006,822289,823659,824694,826263,827505,829022,829410,830545,831304,831319,832379,833430,835286,881074,881444,882732,884163,885421,885659,887246,888311,891350,892912,897161,898635,901165,901648,901760,902857,903108,905224,908418,908586,909176,910481,910511,911315,911793,915177,915733,916075,916897,917771,918152,918359,921028,927430,928065,929085,931076,934474,936215,938959,940462,940469,942286,942476,942480,942587,946794,948045,948069,951346,951366,952138,952237,952581,954748,955001,955634,956075,956445,956659,957260,958163,958618,959550,961892,962716,964039,964402,96
 5647,966393,967201,967304,980089,980684,986689,986834,987539,989099,997325*,998170,999119,999485,1002291,1002682,1002853,1021426,1024511,1024528,1025615,1025795,1030043,1040658,1053724,1055169,1062096,1063809,1065061,1067250,1069661,1071886,1081455,1085078,1136363,1138341,1138444,1141924,1203050,1207729,1208775,1293494,1294512

Propchange: db/derby/code/branches/10.5/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar  9 08:32:37 2012
@@ -1,4 +1,4 @@
 /db/derby/code/branches/10.6/java:942027,957000,957287,958621,962738,965351,987678,1031623,1055601,1068474,1071167
 /db/derby/code/branches/10.7/java:1294731
 /db/derby/code/branches/10.8/java:1209227-1209228,1209284
-/db/derby/code/trunk/java:757811,764912,769596,769602,769606,769962,772090,772337,772449,772534,774281,777105,779681,782991,785131,785139,785163,785570,785662,788369,788670,788674,788968,789264,790218,791027,792001,792254,792434,793089,793588,794106,794276,794303,794955,795166,795459,796020,796027,796316,796372,797147,798347,798742,800523,803336,803548,803948,805696,808494,808850,809643,810860,812669,816531,816536,819006,822289,823659,824694,826263,827505,829022,829410,830545,831304,831319,832379,833430,835286,881074,881444,882732,884163,885421,885659,887246,888311,891350,892912,897161,898635,901165,901648,901760,902857,903108,905224,908418,908586,909176,910481,910511,911315,911793,915177,915733,916075,916897,917771,918152,918359,921028,927430,928065,929085,931076,934474,936215,938959,940462,940469,942286,942476,942480,942587,946794,948045,948069,951346,951366,952138,952237,952581,954748,955001,955634,956075,956445,956659,957260,958163,958618,959550,961892,962716,964039,9644
 02,965647,966393,967201,967304,980089,980684,986689,986834,987539,989099,998170,999119,999485,1002291,1002682,1002853,1021426,1024511,1024528,1025615,1025795,1030043,1040658,1053724,1055169,1062096,1063809,1065061,1067250,1069661,1071886,1081455,1085078,1136363,1138341,1138444,1141924
+/db/derby/code/trunk/java:757811,764912,769596,769602,769606,769962,772090,772337,772449,772534,774281,777105,779681,782991,785131,785139,785163,785570,785662,788369,788670,788674,788968,789264,790218,791027,792001,792254,792434,793089,793588,794106,794276,794303,794955,795166,795459,796020,796027,796316,796372,797147,798347,798742,800523,803336,803548,803948,805696,808494,808850,809643,810860,812669,816531,816536,819006,822289,823659,824694,826263,827505,829022,829410,830545,831304,831319,832379,833430,835286,881074,881444,882732,884163,885421,885659,887246,888311,891350,892912,897161,898635,901165,901648,901760,902857,903108,905224,908418,908586,909176,910481,910511,911315,911793,915177,915733,916075,916897,917771,918152,918359,921028,927430,928065,929085,931076,934474,936215,938959,940462,940469,942286,942476,942480,942587,946794,948045,948069,951346,951366,952138,952237,952581,954748,955001,955634,956075,956445,956659,957260,958163,958618,959550,961892,962716,964039,9644
 02,965647,966393,967201,967304,980089,980684,986689,986834,987539,989099,998170,999119,999485,1002291,1002682,1002853,1021426,1024511,1024528,1025615,1025795,1030043,1040658,1053724,1055169,1062096,1063809,1065061,1067250,1069661,1071886,1081455,1085078,1136363,1138341,1138444,1141924,1294512

Modified: db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/jdbc/EmbedConnection.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/jdbc/EmbedConnection.java?rev=1298750&r1=1298749&r2=1298750&view=diff
==============================================================================
--- db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/jdbc/EmbedConnection.java
(original)
+++ db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/jdbc/EmbedConnection.java
Fri Mar  9 08:32:37 2012
@@ -3082,8 +3082,6 @@ public abstract class EmbedConnection im
 	public void clearLOBMapping() throws SQLException {
 
 		//free all the lob resources in the HashMap
-		//initialize the locator value to 0 and
-		//the hash table object to null.
 		Map map = rootConnection.lobReferences;
 		if (map != null) {
             Iterator it = map.keySet ().iterator ();
@@ -3097,18 +3095,25 @@ public abstract class EmbedConnection im
         }
 		
 		synchronized (this) {   
+            // Try a bit harder to close all open files, as open file handles
+            // can cause problems further down the road.
 			if (lobFiles != null) {       
+                SQLException firstException = null;
 				Iterator it = lobFiles.iterator();
-				while (it.hasNext()) {
-					try {
-						((LOBFile) it.next()).close();
-					} catch (IOException ioe) {
-						throw Util.javaException(ioe);
-					}
-					finally {
-						lobFiles.clear();
-					}
-				}
+                while (it.hasNext()) {
+                    try {
+                        ((LOBFile) it.next()).close();
+                    } catch (IOException ioe) {
+                        // Discard all exceptions besides the first one.
+                        if (firstException == null) {
+                            firstException = Util.javaException(ioe);
+                        }
+                    }
+                }
+                lobFiles.clear();
+                if (firstException != null) {
+                    throw firstException;
+                }
 			}
 		}
 	}
@@ -3157,7 +3162,7 @@ public abstract class EmbedConnection im
 	* Return the Hash Map in the root connection
 	* @return the HashMap that contains the locator to LOB object mapping
 	*/
-	public HashMap getlobHMObj() {
+	private HashMap getlobHMObj() {
 		if (rootConnection.lobHashMap == null) {
 			rootConnection.lobHashMap = new HashMap();
 		}



Mime
View raw message