<html><head></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; "><br><div><div>On 15 Sep 2010, at 10:43, Galder Zamarreņo wrote:</div><br class="Apple-interchange-newline"><blockquote type="cite"><div>Hi Mircea,<br><br>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:</div></blockquote><br><blockquote type="cite"><div><br>In trunk you find:<br><br> public void lock(K key) {<br> assertKeyNotNull(key);<br> //this will be removed with <a href="https://jira.jboss.org/browse/ISPN-598">https://jira.jboss.org/browse/ISPN-598</a> <br> ConfigurationValidatingVisitor.checkEagerLockingAndDld(config, true);<br> lock(Collections.singletonList(key));<br> }<br><br>And in 4.2.x:<br><br> public void lock(K key) {<br> assertKeyNotNull(key);<br> lock(Collections.singletonList(key));<br> }<br><br>First of all, that comment about <a href="https://jira.jboss.org/browse/ISPN-598">https://jira.jboss.org/browse/ISPN-598</a> is probably mixed up. I think it refers to <a href="https://jira.jboss.org/browse/ISPN-589">https://jira.jboss.org/browse/ISPN-589</a> instead.<br></div></blockquote>It's wrong indeed, It refers to <meta charset="utf-8"><span class="Apple-style-span" style="font-family: arial, FreeSans, Helvetica, sans-serif; color: rgb(51, 51, 51); font-size: 14px; line-height: 19px; "><a id="key-val" href="https://jira.jboss.org/browse/ISPN-518" style="cursor: pointer; text-decoration: underline; color: rgb(102, 0, 0); ">ISPN-518</a></span><br><blockquote type="cite"><div><br>Now, <a href="https://jira.jboss.org/browse/ISPN-589">https://jira.jboss.org/browse/ISPN-589</a> has already been fixed. So, are those two lines some leftover due to merge mixup? Or do they really make sense to be there?<br></div></blockquote><meta charset="utf-8"><span class="Apple-style-span" style="font-family: arial, FreeSans, Helvetica, sans-serif; color: rgb(51, 51, 51); font-size: 14px; line-height: 19px; "><a id="key-val" href="https://jira.jboss.org/browse/ISPN-518" style="cursor: pointer; text-decoration: underline; color: rgb(102, 0, 0); ">ISPN-518</a> was fixed on 4.2 and not merged on trunk</span><br><blockquote type="cite"><div><br>The reason this is causing me issues is due to a patch I was trying to apply in trunk wrt <a href="https://jira.jboss.org/browse/ISPN-649">https://jira.jboss.org/browse/ISPN-649</a>.<br></div></blockquote>Sorry for the trouble. I'll make sure trunk is up to date.<br><blockquote type="cite"><div><br>Cheers,<br>--<br>Galder Zamarreņo<br>Sr. Software Engineer<br>Infinispan, JBoss Cache<br><br></div></blockquote></div><br></body></html>