NullPointerException in case of passing customized FetchOptions to ClusteredQuery iterator() method --------------------------------------------------------------------------------------------------- Key: ISPN-2598 URL: https://issues.jboss.org/browse/ISPN-2598 Project: Infinispan Issue Type: Bug Components: Querying Reporter: Anna Manukyan Assignee: Adrian Nistor Labels: clustered_queries Fix For: 6.0.0.CR1 Attachments: ClusteredQueryTest.java While running tests for query module, I've found the following thing. I'm not sure whether this is a bug, but the same flow for CacheQueryImpl works in different way rather than for ClusteredCacheQueryImpl. I'm running the following command on already created ClusteredQuery: {code} ResultIterator iterator = cacheQuery.iterator(new FetchOptions() { public FetchOptions fetchMode(FetchMode fetchMode) { return null; } }); {code} This code throws NullPointerException, as the check of FetchMode is done in switch/case statement. The same code for CacheQuery throws IllegalArgumentException, as the check is done with if/else statement. Please find the test attached.