jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From resc...@apache.org
Subject svn commit: r1478808 - in /jackrabbit/branches/2.6: ./ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/BitSetENTCacheImpl.java jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/BitsetENTCacheImpl.java
Date Fri, 03 May 2013 14:26:20 GMT
Author: reschke
Date: Fri May  3 14:26:18 2013
New Revision: 1478808

URL: http://svn.apache.org/r1478808
Log:
JCR-3581: Incorrect bitwise arithmetic in BitsetENTCacheImpl.BitsetKey.compareTo implementation
- wrong bit mask value used (ported to 2.6)

Modified:
    jackrabbit/branches/2.6/   (props changed)
    jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/BitSetENTCacheImpl.java
    jackrabbit/branches/2.6/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/BitsetENTCacheImpl.java

Propchange: jackrabbit/branches/2.6/
------------------------------------------------------------------------------
  Merged /jackrabbit/trunk:r1478684

Modified: jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/BitSetENTCacheImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/BitSetENTCacheImpl.java?rev=1478808&r1=1478807&r2=1478808&view=diff
==============================================================================
--- jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/BitSetENTCacheImpl.java
(original)
+++ jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/BitSetENTCacheImpl.java
Fri May  3 14:26:18 2013
@@ -410,8 +410,8 @@ public class BitSetENTCacheImpl implemen
                         long h1 = w1 >>> 32;
                         long h2 = w2 >>> 32;
                         if (h1 == h2) {
-                            h1 = w1 & 0x0ffffL;
-                            h2 = w2 & 0x0ffffL;
+                            h1 = w1 & 0x0ffffffffL;
+                            h2 = w2 & 0x0ffffffffL;
                         }
                         return Long.signum(h2 - h1);
                     }

Modified: jackrabbit/branches/2.6/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/BitsetENTCacheImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.6/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/BitsetENTCacheImpl.java?rev=1478808&r1=1478807&r2=1478808&view=diff
==============================================================================
--- jackrabbit/branches/2.6/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/BitsetENTCacheImpl.java
(original)
+++ jackrabbit/branches/2.6/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/BitsetENTCacheImpl.java
Fri May  3 14:26:18 2013
@@ -438,8 +438,8 @@ class BitsetENTCacheImpl implements Effe
                         long h1 = w1 >>> 32;
                         long h2 = w2 >>> 32;
                         if (h1 == h2) {
-                            h1 = w1 & 0x0ffffL;
-                            h2 = w2 & 0x0ffffL;
+                            h1 = w1 & 0x0ffffffffL;
+                            h2 = w2 & 0x0ffffffffL;
                         }
                         return Long.signum(h2 - h1);
                     }



Mime
View raw message