[infinispan-dev] CacheDelegate.lock() strangely differing between trunk and 4.2.x

[Galder Zamarreño]

Hi Mircea,

There's something that's causing me issues in the CacheDelegate code. There're some differences between trunk and 4.2.x which I don't understand:

In trunk you find:

   public void lock(K key) {
      assertKeyNotNull(key);
      //this will be removed with https://jira.jboss.org/browse/ISPN-598 
      ConfigurationValidatingVisitor.checkEagerLockingAndDld(config, true);
      lock(Collections.singletonList(key));
   }

And in 4.2.x:

   public void lock(K key) {
      assertKeyNotNull(key);
      lock(Collections.singletonList(key));
   }

First of all, that comment about https://jira.jboss.org/browse/ISPN-598 is probably mixed up. I think it refers to https://jira.jboss.org/browse/ISPN-589 instead.

Now, https://jira.jboss.org/browse/ISPN-589 has already been fixed. So, are those two lines some leftover due to merge mixup? Or do they really make sense to be there?

The reason this is causing me issues is due to a patch I was trying to apply in trunk wrt https://jira.jboss.org/browse/ISPN-649.

Cheers,
--
Galder Zamarreño
Sr. Software Engineer
Infinispan, JBoss Cache