Author: kristwaa
Date: Thu May 26 09:37:03 2011
New Revision: 1127844
URL: http://svn.apache.org/viewvc?rev=1127844&view=rev
Log:
DERBY-5098: embedded/in-memory: SQLNonTransientConnectionException: No current connection
due to invalid page format
Merged fix from trunk (r1103681,1103718).
Modified:
db/derby/code/branches/10.6/ (props changed)
db/derby/code/branches/10.6/java/engine/org/apache/derby/impl/io/vfmem/BlockedByteArray.java
Propchange: db/derby/code/branches/10.6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 26 09:37:03 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,964039,964115,964402,965647,966393,967201,967304,980089,980684,986689,986834,987539,989099,990292,997325,998170,999119,999479,999485,1002291,1002682,1002853,1021426,1024511,1024528,1025615,1025795,1028716,1030043,1033485,1033864,1035164,1038514,1040658,1053724,1055169,1062096,1063809,1065061,1067250,1069661,1071886,1078461,1081455,1097247
+/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,964039,964115,964402,965647,966393,967201,967304,980089,980684,986689,986834,987539,989099,990292,997325,998170,999119,999479,999485,1002291,1002682,1002853,1021426,1024511,1024528,1025615,1025795,1028716,1030043,1033485,1033864,1035164,1038514,1040658,1053724,1055169,1062096,1063809,1065061,1067250,1069661,1071886,1078461,1081455,1097247,1103681,1103718
/db/derby/docs/trunk:954344
Modified: db/derby/code/branches/10.6/java/engine/org/apache/derby/impl/io/vfmem/BlockedByteArray.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.6/java/engine/org/apache/derby/impl/io/vfmem/BlockedByteArray.java?rev=1127844&r1=1127843&r2=1127844&view=diff
==============================================================================
--- db/derby/code/branches/10.6/java/engine/org/apache/derby/impl/io/vfmem/BlockedByteArray.java
(original)
+++ db/derby/code/branches/10.6/java/engine/org/apache/derby/impl/io/vfmem/BlockedByteArray.java
Thu May 26 09:37:03 2011
@@ -143,7 +143,7 @@ public class BlockedByteArray {
if (blockSize == 0) {
checkBlockSize((int)Math.min(Integer.MAX_VALUE, newLength));
}
- final long currentCapacity = allocatedBlocks * blockSize;
+ final long currentCapacity = (long)allocatedBlocks * blockSize;
if (newLength > currentCapacity) {
// Allocate more blocks.
increaseCapacity(newLength);
@@ -187,9 +187,7 @@ public class BlockedByteArray {
throw new ArrayIndexOutOfBoundsException(len);
}
// Increase the capacity if required.
- if (pos + len >= allocatedBlocks * blockSize) {
- increaseCapacity(pos + len);
- }
+ increaseCapacity(pos + len);
// Calculate the block number and the index within this block.
int block = (int)(pos / blockSize);
int index = (int)(pos % blockSize);
@@ -226,10 +224,7 @@ public class BlockedByteArray {
checkBlockSize(0);
}
// Increase the capacity if required.
- if (pos >= allocatedBlocks * blockSize) {
- increaseCapacity(pos);
- }
-
+ increaseCapacity(pos);
// Calculate the block number and the index within this block.
int block = (int)(pos / blockSize);
int index = (int)(pos % blockSize);
@@ -301,7 +296,7 @@ public class BlockedByteArray {
SanityManager.ASSERT(blockSize > 0, "Invalid/unset block size");
}
// Safe-guard to avoid overwriting existing data.
- if (lastIndex < allocatedBlocks * blockSize) {
+ if (lastIndex < (long)allocatedBlocks * blockSize) {
return;
}
// Calculate required number of blocks, and create those lacking.
|