jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r695432 - in /jackrabbit/branches/1.4/jackrabbit-core: ./ src/main/java/org/apache/jackrabbit/core/xml/BufferedStringValue.java src/main/java/org/apache/jackrabbit/core/xml/StringValue.java
Date Mon, 15 Sep 2008 11:20:22 GMT
Author: jukka
Date: Mon Sep 15 04:20:21 2008
New Revision: 695432

URL: http://svn.apache.org/viewvc?rev=695432&view=rev
Log:
1.4: Merged revision 691550 (JCR-1708)

Modified:
    jackrabbit/branches/1.4/jackrabbit-core/   (props changed)
    jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/BufferedStringValue.java
    jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/StringValue.java

Propchange: jackrabbit/branches/1.4/jackrabbit-core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 15 04:20:21 2008
@@ -1 +1 @@
-/jackrabbit/trunk/jackrabbit-core:653417,654078,654514,655917,656240,656655,656664,658583,679389,680135,694164
+/jackrabbit/trunk/jackrabbit-core:653417,654078,654514,655917,656240,656655,656664,658583,679389,680135,691550,694164

Modified: jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/BufferedStringValue.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/BufferedStringValue.java?rev=695432&r1=695431&r2=695432&view=diff
==============================================================================
--- jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/BufferedStringValue.java
(original)
+++ jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/BufferedStringValue.java
Mon Sep 15 04:20:21 2008
@@ -262,7 +262,7 @@
                 }
             } else {
                 // all other types
-                return ValueHelper.deserialize(retrieve(), targetType, true, ValueFactoryImpl.getInstance());
+                return ValueHelper.deserialize(retrieve(), targetType, false, ValueFactoryImpl.getInstance());
             }
         } catch (IOException e) {
             String msg = "failed to retrieve serialized value";

Modified: jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/StringValue.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/StringValue.java?rev=695432&r1=695431&r2=695432&view=diff
==============================================================================
--- jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/StringValue.java
(original)
+++ jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/StringValue.java
Mon Sep 15 04:20:21 2008
@@ -66,11 +66,9 @@
             // convert InternalValue to Value using this
             // session's namespace mappings
             return ival.toJCRValue(resolver);
-        } else if (type == PropertyType.BINARY) {
-            return ValueHelper.deserialize(value, type, false, ValueFactoryImpl.getInstance());
         } else {
             // all other types
-            return ValueHelper.deserialize(value, type, true, ValueFactoryImpl.getInstance());
+            return ValueHelper.deserialize(value, type, false, ValueFactoryImpl.getInstance());
         }
     }
 



Mime
View raw message