You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by md...@apache.org on 2014/12/15 15:06:48 UTC
svn commit: r1645661 -
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentWriter.java
Author: mduerig
Date: Mon Dec 15 14:06:48 2014
New Revision: 1645661
URL: http://svn.apache.org/r1645661
Log:
OAK-2356: Logic for writing properties in SegmentWriter.writeNode looks off
Fix condition that was broken in an earlier refactoring
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentWriter.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentWriter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentWriter.java?rev=1645661&r1=1645660&r2=1645661&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentWriter.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentWriter.java Mon Dec 15 14:06:48 2014
@@ -1093,8 +1093,8 @@ public class SegmentWriter {
if (property instanceof SegmentPropertyState
&& store.containsSegment(((SegmentPropertyState) property).getRecordId().getSegmentId())) {
ids.add(((SegmentPropertyState) property).getRecordId());
- } else if (!(before instanceof SegmentNodeState)
- || store.containsSegment(before.getRecordId().getSegmentId())) {
+ } else if (before == null
+ || !store.containsSegment(before.getRecordId().getSegmentId())) {
ids.add(writeProperty(property));
} else {
// reuse previously stored property, if possible