Merging bug 22334 into default

Matthew Sackman · Matthew Sackman · commit e40cfe946f23 · 2010-02-09T16:47:31.000Z
diff --git a/projects/client/RabbitMQ.Client/src/util/IntAllocator.cs b/projects/client/RabbitMQ.Client/src/util/IntAllocator.cs
@@ -120,7 +120,7 @@ public static IntervalList Merge(IntervalList x, IntervalList y)
 
       public static IntervalList FromArray(int[] xs, int length)
       {
-        Array.Sort(xs);
+        Array.Sort(xs, 0, length);
 
         IntervalList result = null;
         IntervalList current = null;
@@ -131,7 +131,7 @@ public static IntervalList FromArray(int[] xs, int length)
           while((i < length - 1) && (xs[i + 1] == xs[i] + 1))
             i++;
 
-          IntervalList interval = new IntervalList(start, i);
+          IntervalList interval = new IntervalList(xs[start], xs[i]);
 
           if(result == null)
           {

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ public static IntervalList Merge(IntervalList x, IntervalList y)`
`120`	`120`
`121`	`121`	`public static IntervalList FromArray(int[] xs, int length)`
`122`	`122`	`{`
`123`		`- Array.Sort(xs);`
	`123`	`+ Array.Sort(xs, 0, length);`
`124`	`124`
`125`	`125`	`IntervalList result = null;`
`126`	`126`	`IntervalList current = null;`
`@@ -131,7 +131,7 @@ public static IntervalList FromArray(int[] xs, int length)`
`131`	`131`	`while((i < length - 1) && (xs[i + 1] == xs[i] + 1))`
`132`	`132`	`i++;`
`133`	`133`
`134`		`- IntervalList interval = new IntervalList(start, i);`
	`134`	`+ IntervalList interval = new IntervalList(xs[start], xs[i]);`
`135`	`135`
`136`	`136`	`if(result == null)`
`137`	`137`	`{`