You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@chemistry.apache.org by je...@apache.org on 2014/10/23 21:05:06 UTC

svn commit: r1633922 - /chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/TypeValidator.java

Author: jens
Date: Thu Oct 23 19:05:06 2014
New Revision: 1633922

URL: http://svn.apache.org/r1633922
Log:
fix a bug in TypeValidator, accepting any value for open choices [CMIS-861]

Modified:
    chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/TypeValidator.java

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/TypeValidator.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/TypeValidator.java?rev=1633922&r1=1633921&r2=1633922&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/TypeValidator.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/TypeValidator.java Thu Oct 23 19:05:06 2014
@@ -113,9 +113,12 @@ public final class TypeValidator {
                 }
             }
 
-            // check if value is in list
-            if (hasMultiValueChoiceLists) {
-                // do a complex check if this combination of actual values is
+            if (propDef.isOpenChoice() != null && propDef.isOpenChoice()) {
+            	isAllowedValue = true;
+            } else if (hasMultiValueChoiceLists) {
+                // check if value is in list
+
+            	// do a complex check if this combination of actual values is
                 // allowed check if value is in list
                 isAllowedValue = false;
                 List<?> actualValues = prop.getValues();