beagled/Lucene.Net/upstream-changes/10_fewer-exceptions.patch

   1 From: Daniel Drake <dsd@gentoo.org>
   2
   3 Exception handling is expensive, lets avoid it where possible.
   4
   5 Index: Index/FieldInfos.cs
   6 ===================================================================
   7 RCS file: /cvs/gnome/beagle/beagled/Lucene.Net/Index/FieldInfos.cs,v
   8 retrieving revision 1.5.4.6
   9 diff -u -3 -p -r1.5.4.6 FieldInfos.cs
  10 --- Index/FieldInfos.cs 30 Sep 2006 01:38:28 -0000      1.5.4.6
  11 +++ Index/FieldInfos.cs 30 Sep 2006 02:08:58 -0000
  12 @@ -227,16 +227,9 @@ namespace Lucene.Net.Index
  13
  14                 public int FieldNumber(System.String fieldName)
  15                 {
  16 -                       try
  17 -                       {
  18 -                               FieldInfo fi = FieldInfo(fieldName);
  19 -                               if (fi != null)
  20 -                                       return fi.number;
  21 -                       }
  22 -                       catch (System.IndexOutOfRangeException ioobe)
  23 -                       {
  24 -                               return - 1;
  25 -                       }
  26 +                       FieldInfo fi = FieldInfo(fieldName);
  27 +                       if (fi != null)
  28 +                               return fi.number;
  29                         return - 1;
  30                 }
  31
  32 @@ -255,14 +248,11 @@ namespace Lucene.Net.Index
  33                 /// </returns>
  34                 public System.String FieldName(int fieldNumber)
  35                 {
  36 -                       try
  37 -                       {
  38 -                               return FieldInfo(fieldNumber).name;
  39 -                       }
  40 -                       catch (System.NullReferenceException)
  41 -                       {
  42 +                       FieldInfo info = FieldInfo(fieldNumber);
  43 +                       if (info == null)
  44                                 return "";
  45 -                       }
  46 +                       else
  47 +                               return info.name;
  48                 }
  49
  50                 /// <summary> Return the fieldinfo object referenced by the fieldNumber.</summary>
  51 @@ -273,14 +263,11 @@ namespace Lucene.Net.Index
  52                 /// </returns>
  53                 public FieldInfo FieldInfo(int fieldNumber)
  54                 {
  55 -                       try
  56 -                       {
  57 -                               return (FieldInfo) byNumber[fieldNumber];
  58 -                       }
  59 -                       catch (System.ArgumentOutOfRangeException) // (System.IndexOutOfRangeException)
  60 +                       if (fieldNumber < 0 || fieldNumber >= byNumber.Count)
  61                         {
  62 -                               return null;
  63 +                           return null;
  64                         }
  65 +                       return (FieldInfo) byNumber[fieldNumber];
  66                 }
  67
  68                 public int Size()