jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r1127054 - in /jackrabbit/branches/2.2: ./ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/util/BundleReader.java jackrabbit-core/src/test/java/org/apache/jackrabbit/core/persistence/util/BundleBindingTest.java
Date Tue, 24 May 2011 13:54:41 GMT
Author: jukka
Date: Tue May 24 13:54:41 2011
New Revision: 1127054

URL: http://svn.apache.org/viewvc?rev=1127054&view=rev
Log:
2.2: Merged revision 1100286 (JCR-2960)

Modified:
    jackrabbit/branches/2.2/   (props changed)
    jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/util/BundleReader.java
    jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/persistence/util/BundleBindingTest.java

Propchange: jackrabbit/branches/2.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 24 13:54:41 2011
@@ -2,4 +2,4 @@
 /jackrabbit/sandbox/JCR-1456:774917-886178
 /jackrabbit/sandbox/JCR-2170:812417-816332
 /jackrabbit/sandbox/tripod-JCR-2209:795441-795863
-/jackrabbit/trunk:1038201,1038203,1038205,1038657,1039064,1039347,1039408,1039422-1039423,1039888,1039946,1040033,1040090,1040459,1040601,1040606,1040661,1040958,1041379,1041439,1041761,1042643,1042647,1042978-1042982,1043084-1043086,1043088,1043343,1043357-1043358,1043430,1043554,1043616,1043618,1043637,1043656,1043893,1043897,1044239,1044312,1044451,1044613,1049473,1049491,1049514,1049518,1049520,1049859,1049870,1049874,1049878,1049880,1049883,1049889,1049891,1049894-1049895,1049899-1049901,1049909-1049911,1049915-1049916,1049919,1049923,1049925,1049931,1049936,1049939,1050212,1050298,1050346,1050551,1055068,1055070-1055071,1055116-1055117,1055127,1055134,1055164,1055498,1060431,1060434,1060753,1063756,1064670,1065599,1065622,1066059,1066071,1069831,1071562,1071573,1071680,1074140,1079314,1079317,1080186,1080540,1087304,1088991,1089032,1089053,1089436,1092106,1092117,1092683,1097513-1097514,1098963-1098964,1099033,1104027
+/jackrabbit/trunk:1038201,1038203,1038205,1038657,1039064,1039347,1039408,1039422-1039423,1039888,1039946,1040033,1040090,1040459,1040601,1040606,1040661,1040958,1041379,1041439,1041761,1042643,1042647,1042978-1042982,1043084-1043086,1043088,1043343,1043357-1043358,1043430,1043554,1043616,1043618,1043637,1043656,1043893,1043897,1044239,1044312,1044451,1044613,1049473,1049491,1049514,1049518,1049520,1049859,1049870,1049874,1049878,1049880,1049883,1049889,1049891,1049894-1049895,1049899-1049901,1049909-1049911,1049915-1049916,1049919,1049923,1049925,1049931,1049936,1049939,1050212,1050298,1050346,1050551,1055068,1055070-1055071,1055116-1055117,1055127,1055134,1055164,1055498,1060431,1060434,1060753,1063756,1064670,1065599,1065622,1066059,1066071,1069831,1071562,1071573,1071680,1074140,1079314,1079317,1080186,1080540,1087304,1088991,1089032,1089053,1089436,1092106,1092117,1092683,1097513-1097514,1098963-1098964,1099033,1100286,1104027

Modified: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/util/BundleReader.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/util/BundleReader.java?rev=1127054&r1=1127053&r2=1127054&view=diff
==============================================================================
--- jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/util/BundleReader.java
(original)
+++ jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/util/BundleReader.java
Tue May 24 13:54:41 2011
@@ -549,8 +549,13 @@ class BundleReader {
         long b;
         do {
             b = in.readUnsignedByte();
-            value = (b & 0x7f) << 57 | value >>> 7;
-            bits += 7;
+            if (bits < 57) {
+                value = (b & 0x7f) << 57 | value >>> 7;
+                bits += 7;
+            } else {
+                value = (b & 0x01) << 63 | value >>> 1;
+                bits = 64;
+            }
         } while ((b & 0x80) != 0);
         value = value >>> (64 - bits);
         if ((value & 1) != 0) {

Modified: jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/persistence/util/BundleBindingTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/persistence/util/BundleBindingTest.java?rev=1127054&r1=1127053&r2=1127054&view=diff
==============================================================================
--- jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/persistence/util/BundleBindingTest.java
(original)
+++ jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/persistence/util/BundleBindingTest.java
Tue May 24 13:54:41 2011
@@ -311,6 +311,37 @@ public class BundleBindingTest extends T
         assertBundleRoundtrip(bundle);
     }
 
+    public void testBooleanSerialization() throws Exception {
+        assertValueSerialization(InternalValue.create(true));
+        assertValueSerialization(InternalValue.create(false));
+    }
+
+    /**
+     * Tests serialization of long values.
+     */
+    public void testLongSerialization() throws Exception {
+        assertValueSerialization(InternalValue.create(0));
+        assertValueSerialization(InternalValue.create(1));
+        assertValueSerialization(InternalValue.create(-1));
+        assertValueSerialization(InternalValue.create(1234567890));
+        assertValueSerialization(InternalValue.create(-1234567890));
+        assertValueSerialization(InternalValue.create(Long.MAX_VALUE));
+        assertValueSerialization(InternalValue.create(Long.MIN_VALUE));
+    }
+
+    public void testDoubleSerialization() throws Exception {
+        assertValueSerialization(InternalValue.create(0.0));
+        assertValueSerialization(InternalValue.create(1.0));
+        assertValueSerialization(InternalValue.create(-1.0));
+        assertValueSerialization(InternalValue.create(12345.6789));
+        assertValueSerialization(InternalValue.create(-12345.6789));
+        assertValueSerialization(InternalValue.create(Double.MAX_VALUE));
+        assertValueSerialization(InternalValue.create(Double.MIN_VALUE));
+        assertValueSerialization(InternalValue.create(Double.POSITIVE_INFINITY));
+        assertValueSerialization(InternalValue.create(Double.NEGATIVE_INFINITY));
+        assertValueSerialization(InternalValue.create(Double.NaN));
+    }
+
     /**
      * Tests serialization of date values.
      */



Mime
View raw message