cvs commit: jakarta-slide/src/share/org/apache/slide/store DefaultIndexer.java

[unico]

unico       2004/07/02 07:11:16

  Modified:    src/share/org/apache/slide/store DefaultIndexer.java
  Log:
  let store decide if expression factory is singleton or not
  
  Revision  Changes    Path
  1.5       +11 -6     
jakarta-slide/src/share/org/apache/slide/store/DefaultIndexer.java
  
  Index: DefaultIndexer.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/share/org/apache/slide/store/DefaultIndexer.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DefaultIndexer.java       1 Jul 2004 13:00:30 -0000       1.4
  +++ DefaultIndexer.java       2 Jul 2004 14:11:16 -0000       1.5
  @@ -50,8 +50,7 @@
    */
   public class DefaultIndexer extends XAServiceBase implements IndexStore
   {
  -    
  -    private IBasicExpressionFactory factory = null;
  +    private final IBasicExpressionFactoryProvider expressionProvider;
       
       /**
        * Uses the ExpressionFactory of associated store (if applicable)
  @@ -61,7 +60,10 @@
        */
       public DefaultIndexer (Object associatedStore) {
           if (associatedStore instanceof IBasicExpressionFactoryProvider) {
  -            factory = 
((IBasicExpressionFactoryProvider)associatedStore).getBasicExpressionFactory();
  +            expressionProvider = (IBasicExpressionFactoryProvider) associatedStore;
  +        }
  +        else {
  +            expressionProvider = null;
           }
       }
       
  @@ -73,7 +75,10 @@
        */
       public IBasicExpressionFactory getBasicExpressionFactory()
       {
  -        return factory;
  +        if (expressionProvider != null) {
  +            return expressionProvider.getBasicExpressionFactory();
  +        }
  +        return null;
       }
       
       // used for two phase commit state
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]