Author: baedke Date: Mon Feb 15 14:24:28 2016 New Revision: 1730538 URL: http://svn.apache.org/viewvc?rev=1730538&view=rev Log: OAK-4018: Test failures after upgrading to JR 2.12.0
Fixed migration code with respect to JCR-2633 (patch provided by tom...@adobe.com). Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java?rev=1730538&r1=1730537&r2=1730538&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java (original) +++ jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java Mon Feb 15 14:24:28 2016 @@ -394,6 +394,22 @@ class JackrabbitNodeState extends Abstra properties.put(JCR_PRIMARYTYPE, PropertyStates.createProperty( JCR_PRIMARYTYPE, primary, Type.NAME)); + for (PropertyEntry property : bundle.getPropertyEntries()) { + String name = createName(property.getName()); + try { + int type = property.getType(); + if (property.isMultiValued()) { + properties.put(name, createProperty( + name, type, property.getValues())); + } else { + properties.put(name, createProperty( + name, type, property.getValues()[0])); + } + } catch (Exception e) { + warn("Skipping broken property entry " + name, e); + } + } + Set<String> mixins = newLinkedHashSet(); if (bundle.getMixinTypeNames() != null) { for (Name mixin : bundle.getMixinTypeNames()) { @@ -416,22 +432,6 @@ class JackrabbitNodeState extends Abstra JCR_UUID, bundle.getId().toString())); } - for (PropertyEntry property : bundle.getPropertyEntries()) { - String name = createName(property.getName()); - try { - int type = property.getType(); - if (property.isMultiValued()) { - properties.put(name, createProperty( - name, type, property.getValues())); - } else { - properties.put(name, createProperty( - name, type, property.getValues()[0])); - } - } catch (Exception e) { - warn("Skipping broken property entry " + name, e); - } - } - return properties; }