You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by ka...@apache.org on 2006/11/30 08:02:11 UTC
svn commit: r480861 -
/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StoredPage.java
Author: kahatlen
Date: Wed Nov 29 23:02:10 2006
New Revision: 480861
URL: http://svn.apache.org/viewvc?view=rev&rev=480861
Log:
DERBY-2123: Remove workaround for old JIT bug from StoredPage
Modified:
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StoredPage.java
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StoredPage.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StoredPage.java?view=diff&rev=480861&r1=480860&r2=480861
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StoredPage.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StoredPage.java Wed Nov 29 23:02:10 2006
@@ -1492,7 +1492,6 @@
fetchDesc.getMaterializedColumns(),
lrdi,
recordHeader,
- (ErrorObjectInput) null /* always null */,
recordToLock);
}
else
@@ -1504,7 +1503,6 @@
(int[]) null,
lrdi,
recordHeader,
- (ErrorObjectInput) null /* always null */,
recordToLock);
}
@@ -1527,7 +1525,6 @@
fetchDesc.getMaterializedColumns(),
lrdi,
recordHeader,
- (ErrorObjectInput) null /* always null */,
recordToLock);
}
else
@@ -1539,7 +1536,6 @@
(int[]) null,
lrdi,
recordHeader,
- (ErrorObjectInput) null /* always null */,
recordToLock);
}
@@ -1683,7 +1679,6 @@
fetchDesc.getMaterializedColumns(),
lrdi,
recordHeader,
- (ErrorObjectInput) null /* always null */,
recordToLock);
}
else
@@ -1695,7 +1690,6 @@
(int[]) null,
lrdi,
recordHeader,
- (ErrorObjectInput) null /* always null */,
recordToLock);
}
@@ -4346,7 +4340,7 @@
(int[]) null,
in,
recordHeader,
- (ErrorObjectInput) null /* always null */, null);
+ null);
}
/**
@@ -4844,11 +4838,7 @@
* Process the list of qualifiers on the row in the stream.
* <p>
* The rawDataIn stream is expected to be positioned after the record
- * header. The inUserCode parameter here is only to get around a
- * JDK 1.1.x (at least 1.1.7) JIT bug. If inUserCode was a local variable
- * then it is not correctly set on an exception, the only time we care
- * about its value. It seems to work when its a parameter. Null should
- * always be passed in. This bug is fixed in the JDK 1.2 JIT.
+ * header.
* <p>
* Check all qualifiers in the qualifier array against row. Return true
* if all compares specified by the qualifier array return true, else
@@ -5075,12 +5065,7 @@
* restore a record from a stream.
* <p>
* The rawDataIn stream is expected to be positioned after the record
- * header. The inUserCode parameter here is only to get around a
- * JDK 1.1.x (at least 1.1.7) JIT bug. If inUserCode was a local variable
- * then it is not correctly set on an exception, the only time we care
- * about its value. It seems to work when its a parameter. Null should
- * always be passed in. This bug is fixed in the JDK 1.2 JIT.
- * <p>
+ * header.
*
* @return The identifier to be used to open the conglomerate later.
*
@@ -5097,7 +5082,6 @@
* @param dataIn restore row from this stream.
* @param recordHeader The record header of the row, it was read in
* from stream and dataIn is positioned after it.
- * @param inUserCode see comments above about jit bug.
* @param recordToLock The head row to use for locking, used to lock
* head row of overflow columns/rows.
*
@@ -5110,10 +5094,10 @@
int[] mCols,
LimitObjectInput dataIn,
StoredRecordHeader recordHeader,
- ErrorObjectInput inUserCode,
RecordHandle recordToLock)
throws StandardException, IOException
{
+ ErrorObjectInput inUserCode = null;
try
{
// Get the number of columns in the row.
@@ -5429,10 +5413,10 @@
int[] mCols,
ArrayInputStream dataIn,
StoredRecordHeader recordHeader,
- ErrorObjectInput inUserCode,
RecordHandle recordToLock)
throws StandardException, IOException
{
+ ErrorObjectInput inUserCode = null;
try
{
// Get the number of columns in the row.