#265 fix for intersect/batch when internal caches are empty

Author: Adam Collins

grails-app/services/au/org/ala/spatial/FieldService.groovy

@@ -20,6 +20,7 @@ import groovy.sql.Sql
 import org.codehaus.jackson.map.DeserializationConfig
 import org.codehaus.jackson.map.ObjectMapper
 import org.postgresql.core.Field
+import org.springframework.transaction.support.TransactionSynchronizationManager
 
 import java.sql.ResultSet
 
@@ -269,10 +270,21 @@ class FieldService {
     }
 
     List<Fields> getFields(boolean includeAdmin = false) {
-        if (includeAdmin) {
-            Fields.findAll()
+        // wrap in a transaction if it is not already, unsure why this is necessary for some instances
+        if (TransactionSynchronizationManager.isActualTransactionActive()) {
+            if (includeAdmin) {
+                Fields.findAll()
+            } else {
+                Fields.findAllByEnabled(true)
+            }
         } else {
-            Fields.findAllByEnabled(true)
+            Fields.withTransaction {
+                if (includeAdmin) {
+                    Fields.findAll()
+                } else {
+                    Fields.findAllByEnabled(true)
+                }
+            }
         }
     }