You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2008/09/03 11:15:31 UTC
svn commit: r691550 - in
/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml:
BufferedStringValue.java StringValue.java
Author: jukka
Date: Wed Sep 3 02:15:30 2008
New Revision: 691550
URL: http://svn.apache.org/viewvc?rev=691550&view=rev
Log:
JCR-1708: Impossible to import a string containing _x0020_ with Session.importXml
Disable _x0020_ decoding in import since we do not use it in export.
Modified:
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/BufferedStringValue.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/StringValue.java
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/BufferedStringValue.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/BufferedStringValue.java?rev=691550&r1=691549&r2=691550&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/BufferedStringValue.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/BufferedStringValue.java Wed Sep 3 02:15:30 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/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/StringValue.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/StringValue.java?rev=691550&r1=691549&r2=691550&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/StringValue.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/StringValue.java Wed Sep 3 02:15:30 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());
}
}