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 2013/05/06 13:07:16 UTC

svn commit: r1479521 - in /jackrabbit/branches/2.2: ./ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/BatchedItemOperations.java

Author: jukka
Date: Mon May  6 11:07:16 2013
New Revision: 1479521

URL: http://svn.apache.org/r1479521
Log:
2.2: Merged revision 1479518 (JCR-3523)

Modified:
    jackrabbit/branches/2.2/   (props changed)
    jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/BatchedItemOperations.java

Propchange: jackrabbit/branches/2.2/
------------------------------------------------------------------------------
  Merged /jackrabbit/trunk:r1479518

Modified: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/BatchedItemOperations.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/BatchedItemOperations.java?rev=1479521&r1=1479520&r2=1479521&view=diff
==============================================================================
--- jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/BatchedItemOperations.java (original)
+++ jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/BatchedItemOperations.java Mon May  6 11:07:16 2013
@@ -441,7 +441,8 @@ public class BatchedItemOperations exten
             for (int i = 0; i < values.length; i++) {
                 NodeId adjusted = refTracker.getMappedId(values[i].getNodeId());
                 if (adjusted != null) {
-                    newVals[i] = InternalValue.create(adjusted);
+                    boolean weak = prop.getType() == PropertyType.WEAKREFERENCE;
+                    newVals[i] = InternalValue.create(adjusted, weak);
                     modified = true;
                 } else {
                     // reference doesn't need adjusting, just copy old value