Clean up the locking loop, and fix a leak
Index: beagled/Lucene.Net/Analysis/Standard/StandardTokenizer.cs
===================================================================
RCS file: /cvs/gnome/beagle/beagled/Lucene.Net/Analysis/Standard/StandardTokenizer.cs,v
retrieving revision 1.4
diff -u -B -p -r1.4 StandardTokenizer.cs
--- beagled/Lucene.Net/Analysis/Standard/StandardTokenizer.cs 7 Oct 2005 00:54:06 -0000 1.4
+++ beagled/Lucene.Net/Analysis/Standard/StandardTokenizer.cs 29 Oct 2005 15:14:23 -0000
@@ -111,7 +111,14 @@ namespace Lucene.Net.Analysis.Standard
}
throw new System.ApplicationException("Missing return statement in function");
}
-
+
+ /// By default, closes the input Reader.
+ public override void Close()
+ {
+ token_source.Close ();
+ base.Close ();
+ }
+
public StandardTokenizerTokenManager token_source;
public Token token, jj_nt;
private int jj_ntk;
Index: beagled/Lucene.Net/Analysis/Standard/StandardTokenizerTokenManager.cs
===================================================================
RCS file: /cvs/gnome/beagle/beagled/Lucene.Net/Analysis/Standard/StandardTokenizerTokenManager.cs,v
retrieving revision 1.4
diff -u -B -p -r1.4 StandardTokenizerTokenManager.cs
--- beagled/Lucene.Net/Analysis/Standard/StandardTokenizerTokenManager.cs 17 Oct 2005 18:58:06 -0000 1.4
+++ beagled/Lucene.Net/Analysis/Standard/StandardTokenizerTokenManager.cs 29 Oct 2005 15:14:25 -0000
@@ -20,6 +20,14 @@ namespace Lucene.Net.Analysis.Standard
public class StandardTokenizerTokenManager : StandardTokenizerConstants
{
+
+ /// By default, closes the input Reader.
+ public void Close()
+ {
+ debugStream.Close();
+ input_stream.Done();
+ }
+
private void InitBlock()
{
System.IO.StreamWriter temp_writer;
Index: beagled/Lucene.Net/Store/Lock.cs
===================================================================
RCS file: /cvs/gnome/beagle/beagled/Lucene.Net/Store/Lock.cs,v
retrieving revision 1.4
diff -u -B -p -r1.4 Lock.cs
--- beagled/Lucene.Net/Store/Lock.cs 27 Oct 2005 20:10:34 -0000 1.4
+++ beagled/Lucene.Net/Store/Lock.cs 29 Oct 2005 15:14:26 -0000
@@ -70,14 +70,7 @@ namespace Lucene.Net.Store
}
++sleepCount;
- 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;