[CORDA-1397]: Fixed incorrect exception handling in NodeVaultService._query(). (#3043)

docs/source/changelog.rst

@@ -7,6 +7,10 @@ release, see :doc:`upgrade-notes`.
 Unreleased
 ==========
 
+* Fixed incorrect exception handling in ``NodeVaultService._query()``.
+
+* Avoided a memory leak deriving from incorrect MappedSchema caching strategy.
+
 * Fix CORDA-1403 where a property of a class that implemented a generic interface could not be deserialised in
   a factory without a serialiser as the subtype check for the class instance failed. Fix is to compare the raw
   type.

node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt

@@ -396,7 +396,6 @@ class NodeVaultService(
         // TODO: revisit (use single instance of parser for all queries)
         val criteriaParser = HibernateQueryCriteriaParser(contractStateType, contractStateTypeMappings, criteriaBuilder, criteriaQuery, queryRootVaultStates)
 
-        try {
         // parse criteria and build where predicates
         criteriaParser.parse(criteria, sorting)
 
@@ -451,10 +450,6 @@ class NodeVaultService(
             statesAndRefs.addAll(servicesForResolution.loadStates(stateRefs) as Collection<StateAndRef<T>>)
 
         return Vault.Page(states = statesAndRefs, statesMetadata = statesMeta, stateTypes = criteriaParser.stateTypes, totalStatesAvailable = totalStates, otherResults = otherResults)
-        } catch (e: java.lang.Exception) {
-            log.error(e.message)
-            throw e.cause ?: e
-        }
     }
 
     @Throws(VaultQueryException::class)