svn commit: r1614330 - /chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/JSONConverter.java

[fmui]

Author: fmui
Date: Tue Jul 29 12:54:33 2014
New Revision: 1614330

URL: http://svn.apache.org/r1614330
Log:
Client: Browser Binding: fixed an issue with SCORE() values in queries

Modified:
    
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/JSONConverter.java

Modified: 
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/JSONConverter.java
URL: 
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/JSONConverter.java?rev=1614330&r1=1614329&r2=1614330&view=diff
==============================================================================
--- 
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/JSONConverter.java
 (original)
+++ 
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/JSONConverter.java
 Tue Jul 29 12:54:33 2014
@@ -2046,7 +2046,8 @@ public final class JSONConverter {
                 AbstractPropertyData<?> property = null;
 
                 String id = getString(jsonPropertyMap, JSON_PROPERTY_ID);
-                if (id == null) {
+                String queryName = getString(jsonPropertyMap, 
JSON_PROPERTY_QUERYNAME);
+                if (id == null && queryName == null) {
                     throw new CmisRuntimeException("Invalid property!");
                 }
 
@@ -2104,7 +2105,7 @@ public final class JSONConverter {
 
                 property.setId(id);
                 property.setDisplayName(getString(jsonPropertyMap, 
JSON_PROPERTY_DISPLAYNAME));
-                property.setQueryName(getString(jsonPropertyMap, 
JSON_PROPERTY_QUERYNAME));
+                property.setQueryName(queryName);
                 property.setLocalName(getString(jsonPropertyMap, 
JSON_PROPERTY_LOCALNAME));
 
                 convertExtension(jsonPropertyMap, property, PROPERTY_KEYS);