svn commit: r1743621 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/xml/PropInfo.java

[angela]

Author: angela
Date: Fri May 13 08:40:44 2016
New Revision: 1743621

URL: http://svn.apache.org/viewvc?rev=1743621&view=rev
Log:
OAK-4261 : Add PropInfo.asPropertyState (-> rename values to vs in order to 
avoid hidding instance field)

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/xml/PropInfo.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/xml/PropInfo.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/xml/PropInfo.java?rev=1743621&r1=1743620&r2=1743621&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/xml/PropInfo.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/xml/PropInfo.java
 Fri May 13 08:40:44 2016
@@ -198,12 +198,12 @@ public class PropInfo {
     }
 
     public PropertyState asPropertyState(@Nonnull PropertyDefinition 
propertyDefinition) throws RepositoryException {
-        List<Value> values = getValues(getTargetType(propertyDefinition));
+        List<Value> vs = getValues(getTargetType(propertyDefinition));
         PropertyState propertyState;
-        if (values.size() == 1 && !propertyDefinition.isMultiple()) {
-            propertyState = PropertyStates.createProperty(name, values.get(0));
+        if (vs.size() == 1 && !propertyDefinition.isMultiple()) {
+            propertyState = PropertyStates.createProperty(name, vs.get(0));
         } else {
-            propertyState = PropertyStates.createProperty(name, values);
+            propertyState = PropertyStates.createProperty(name, vs);
         }
         return propertyState;
     }