beagle r4516 - in branches/beagle-lucene2_1/beagled/Lucene.Net: Store upstream-changes

[dbera svn gnome org]

Author: dbera
Date: Fri Feb 22 00:27:20 2008
New Revision: 4516
URL: http://svn.gnome.org/viewvc/beagle?rev=4516&view=rev

Log:
Add old patch 13_lock-loop-cleanup.patch


Added:
   branches/beagle-lucene2_1/beagled/Lucene.Net/upstream-changes/07_lock-loop-cleanup.patch
Modified:
   branches/beagle-lucene2_1/beagled/Lucene.Net/Store/Lock.cs

Modified: branches/beagle-lucene2_1/beagled/Lucene.Net/Store/Lock.cs
==============================================================================
--- branches/beagle-lucene2_1/beagled/Lucene.Net/Store/Lock.cs	(original)
+++ branches/beagle-lucene2_1/beagled/Lucene.Net/Store/Lock.cs	Fri Feb 22 00:27:20 2008
@@ -85,14 +85,7 @@
 					}
 					throw e;
 				}
-				try
-				{
-					System.Threading.Thread.Sleep(new System.TimeSpan((System.Int64) 10000 * LOCK_POLL_INTERVAL));
-				}
-				catch (System.Threading.ThreadInterruptedException e)
-				{
-					throw new System.IO.IOException(e.ToString());
-				}
+				System.Threading.Thread.Sleep((int) LOCK_POLL_INTERVAL);
 				locked = Obtain();
 			}
 			return locked;

Added: branches/beagle-lucene2_1/beagled/Lucene.Net/upstream-changes/07_lock-loop-cleanup.patch
==============================================================================
--- (empty file)
+++ branches/beagle-lucene2_1/beagled/Lucene.Net/upstream-changes/07_lock-loop-cleanup.patch	Fri Feb 22 00:27:20 2008
@@ -0,0 +1,27 @@
+From: Daniel Drake <dsd gentoo org>
+
+There's no need to try and catch ThreadInterruptedException since it is never
+thrown from Sleep().
+
+Also simplify the sleep call - no need to allocate a TimeSpan here...
+
+Index: Store/Lock.cs
+===================================================================
+--- Store/Lock.cs	(revision 4513)
++++ Store/Lock.cs	(working copy)
+@@ -85,14 +85,7 @@
+ 					}
+ 					throw e;
+ 				}
+-				try
+-				{
+-					System.Threading.Thread.Sleep(new System.TimeSpan((System.Int64) 10000 * LOCK_POLL_INTERVAL));
+-				}
+-				catch (System.Threading.ThreadInterruptedException e)
+-				{
+-					throw new System.IO.IOException(e.ToString());
+-				}
++				System.Threading.Thread.Sleep((int) LOCK_POLL_INTERVAL);
+ 				locked = Obtain();
+ 			}
+ 			return locked;