Author: sannegrinovero Date: 2009-04-05 13:39:43 -0400 (Sun, 05 Apr 2009) New Revision: 16260 Modified: search/branches/Branch_3_1/src/java/org/hibernate/search/filter/FilterOptimizationHelper.java Log: porting HSEARCH-355 fix from trunk to 3.1 branch Modified: search/branches/Branch_3_1/src/java/org/hibernate/search/filter/FilterOptimizationHelper.java =================================================================== --- search/branches/Branch_3_1/src/java/org/hibernate/search/filter/FilterOptimizationHelper.java 2009-04-03 23:58:21 UTC (rev 16259) +++ search/branches/Branch_3_1/src/java/org/hibernate/search/filter/FilterOptimizationHelper.java 2009-04-05 17:39:43 UTC (rev 16260) @@ -44,10 +44,10 @@ return docIdSets; } if ( openBitSets.size() > 0 ) { - nonMergeAble.add( mergeByBitAnds( openBitSets ) ); + nonMergeAble.add( mergeByBitAndsForOpenBitSet( openBitSets ) ); } if ( docIdBitSets.size() > 0 ) { - nonMergeAble.add( mergeByBitAnds( docIdBitSets ) ); + nonMergeAble.add( mergeByBitAndsForDocIdBitSet( docIdBitSets ) ); } return nonMergeAble; } @@ -60,7 +60,7 @@ * @return a new DocIdBitSet, or the first element if only * one element was found in the list. */ - public static DocIdBitSet mergeByBitAnds(List<DocIdBitSet> docIdBitSets) { + private static DocIdBitSet mergeByBitAndsForDocIdBitSet(List<DocIdBitSet> docIdBitSets) { int listSize = docIdBitSets.size(); if ( listSize == 1 ) { return docIdBitSets.get( 0 ); @@ -82,7 +82,7 @@ * @return a new OpenBitSet, or the first element if only * one element was found in the list. */ - public static OpenBitSet mergeByBitAnds(List<OpenBitSet> openBitSets) { + private static OpenBitSet mergeByBitAndsForOpenBitSet(List<OpenBitSet> openBitSets) { int listSize = openBitSets.size(); if ( listSize == 1 ) { return openBitSets.get( 0 );