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 2010/10/29 10:26:28 UTC
svn commit: r1028639 -
/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/OpenConglomerate.java
Author: kahatlen
Date: Fri Oct 29 08:26:27 2010
New Revision: 1028639
URL: http://svn.apache.org/viewvc?rev=1028639&view=rev
Log:
DERBY-4685: Dead/unreachable code in OpenConglomerate.lockPositionForWrite()
Modified:
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/OpenConglomerate.java
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/OpenConglomerate.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/OpenConglomerate.java?rev=1028639&r1=1028638&r2=1028639&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/OpenConglomerate.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/OpenConglomerate.java Fri Oct 29 08:26:27 2010
@@ -571,12 +571,6 @@ public abstract class OpenConglomerate
if (!lock_granted_with_latch_held)
{
- if (!waitForLock)
- {
- // throw lock timeout error.
- throw StandardException.newException(SQLState.LOCK_TIMEOUT);
- }
-
// Could not get the lock NOWAIT, release latch and wait for lock.
pos.current_page.unlatch();
pos.current_page = null;