fix for HibernateCriteriaBuilder due to change in the way Groovy handles call/doCall

git-svn-id: https://svn.codehaus.org/grails/trunk@6276 1cfb16fd-6d17-0410-8ff1-b7e8e1e2867d

Author: graeme

src/persistence/grails/orm/HibernateCriteriaBuilder.java

@@ -95,22 +95,23 @@ public class HibernateCriteriaBuilder extends GroovyObjectSupport {
     public static final String ORDER_ASCENDING = "asc";
 
 
-    private static final String ROOT_CALL = "doCall";
+    private static final String ROOT_DO_CALL = "doCall";
+    private static final String ROOT_CALL = "call";
     private static final String LIST_CALL = "list";
     private static final String LIST_DISTINCT_CALL = "listDistinct";
     private static final String COUNT_CALL = "count";
     private static final String GET_CALL = "get";
     private static final String SCROLL_CALL = "scroll";
-    private static final String PROJECTIONS = "projections";
 
 
+    private static final String PROJECTIONS = "projections";
     private SessionFactory sessionFactory;
     private Session session;
     private Class targetClass;
     private Criteria criteria;
     private MetaClass criteriaMetaClass;
-    private boolean uniqueResult = false;
 
+    private boolean uniqueResult = false;
     private Stack logicalExpressionStack = new Stack();
     private boolean participate;
     private boolean scroll;
@@ -122,7 +123,6 @@ public class HibernateCriteriaBuilder extends GroovyObjectSupport {
     private ResultTransformer resultTransformer;
 
 
-
     public HibernateCriteriaBuilder(Class targetClass, SessionFactory sessionFactory) {
         super();
         this.targetClass = targetClass;
@@ -679,15 +679,9 @@ private boolean validateSimpleExpression() {
 
     public Object invokeMethod(String name, Object obj) {
         Object[] args = obj.getClass().isArray() ? (Object[])obj : new Object[]{obj};
-        if(this.criteria != null)
-            this.criteriaMetaClass = GroovySystem.getMetaClassRegistry().getMetaClass(criteria.getClass());
+
 
-        if(name.equals(ROOT_CALL) ||
-                name.equals(LIST_CALL) ||
-                name.equals(LIST_DISTINCT_CALL) ||
-                name.equals(GET_CALL) ||
-                name.equals(COUNT_CALL) ||
-                name.equals(SCROLL_CALL) && args.length == 1 && args[0] instanceof Closure) {
+        if(isCriteriaConstructionMethod(name, args)) {
 
             if(this.criteria != null) {
                 throwRuntimeException( new IllegalArgumentException("call to [" + name + "] not supported here"));
@@ -707,14 +701,7 @@ else if (name.equals(LIST_DISTINCT_CALL)) {
                 this.resultTransformer = CriteriaSpecification.DISTINCT_ROOT_ENTITY;
             }
 
-            if(TransactionSynchronizationManager.hasResource(sessionFactory)) {
-                this.participate = true;
-                this.session = ((SessionHolder)TransactionSynchronizationManager.getResource(sessionFactory)).getSession();
-            }
-            else {
-                this.session = sessionFactory.openSession();
-            }
-            this.criteria = this.session.createCriteria(targetClass);
+            createCriteriaInstance();
 
             invokeClosureNode(args);
 
@@ -746,6 +733,8 @@ else if(count) {
         }
         else {
 
+            if(criteria==null) createCriteriaInstance();
+
            MetaMethod metaMethod = getMetaClass().getMetaMethod(name, args);
             if(metaMethod != null) {
                  return metaMethod.invoke(this, args);
@@ -846,6 +835,29 @@ else if(name.equals( IS_NOT_EMPTY )) {
         throw new MissingMethodException(name, getClass(), args) ;
     }
 
+    private boolean isCriteriaConstructionMethod(String name, Object[] args) {
+        return name.equals(ROOT_CALL) ||
+                name.equals(ROOT_DO_CALL) ||
+                name.equals(LIST_CALL) ||
+                name.equals(LIST_DISTINCT_CALL) ||
+                name.equals(GET_CALL) ||
+                name.equals(COUNT_CALL) ||
+                name.equals(SCROLL_CALL) && args.length == 1 && args[0] instanceof Closure;
+    }
+
+    private void createCriteriaInstance() {
+        if(TransactionSynchronizationManager.hasResource(sessionFactory)) {
+            this.participate = true;
+            this.session = ((SessionHolder)TransactionSynchronizationManager.getResource(sessionFactory)).getSession();
+        }
+        else {
+            this.session = sessionFactory.openSession();
+        }
+        
+        this.criteria = this.session.createCriteria(targetClass);
+        this.criteriaMetaClass = GroovySystem.getMetaClassRegistry().getMetaClass(criteria.getClass());
+    }
+
     private void invokeClosureNode(Object[] args) {
         Closure callable = (Closure)args[0];
         callable.setDelegate(this);