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/08/18 10:07:58 UTC
svn commit: r1618559 - in /jackrabbit/oak/branches/1.0: ./
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/PropertyDefinitionImpl.java
Author: mduerig
Date: Mon Aug 18 08:07:57 2014
New Revision: 1618559
URL: http://svn.apache.org/r1618559
Log:
OAK-2026: Incompatibility with PropertyDefinitionImpl#getValueConstraints potentially returning null values.
Merged revision 1618158
Modified:
jackrabbit/oak/branches/1.0/ (props changed)
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/PropertyDefinitionImpl.java
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk:r1618158
Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/PropertyDefinitionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/PropertyDefinitionImpl.java?rev=1618559&r1=1618558&r2=1618559&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/PropertyDefinitionImpl.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/PropertyDefinitionImpl.java Mon Aug 18 08:07:57 2014
@@ -90,7 +90,12 @@ class PropertyDefinitionImpl extends Ite
@Override
public String[] getValueConstraints() {
// TODO: namespace mapping?
- return getStrings(JcrConstants.JCR_VALUECONSTRAINTS);
+ String[] valConstraints = getStrings(JcrConstants.JCR_VALUECONSTRAINTS);
+ if (valConstraints != null) {
+ return valConstraints;
+ } else {
+ return new String[0];
+ }
}
@Override