branch develop updated (b7352ae -> 2ceebde)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wikitty. See http://git.nuiton.org/wikitty.git from b7352ae fixes bug in test after change WikittyAuthorisation.parent cardinality new 2ceebde fixes bug in field converion for binary type. binary type can be byte array no automatique migration in this case The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 2ceebde04930333c2d7d5aa2f38293c12e78b243 Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Sat Jul 18 01:10:26 2015 +0200 fixes bug in field converion for binary type. binary type can be byte array no automatique migration in this case Summary of changes: wikitty-api/src/main/java/org/nuiton/wikitty/entities/FieldType.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wikitty. See http://git.nuiton.org/wikitty.git commit 2ceebde04930333c2d7d5aa2f38293c12e78b243 Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Sat Jul 18 01:10:26 2015 +0200 fixes bug in field converion for binary type. binary type can be byte array no automatique migration in this case --- wikitty-api/src/main/java/org/nuiton/wikitty/entities/FieldType.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/wikitty-api/src/main/java/org/nuiton/wikitty/entities/FieldType.java b/wikitty-api/src/main/java/org/nuiton/wikitty/entities/FieldType.java index 8ee6b63..2cb4ccb 100644 --- a/wikitty-api/src/main/java/org/nuiton/wikitty/entities/FieldType.java +++ b/wikitty-api/src/main/java/org/nuiton/wikitty/entities/FieldType.java @@ -132,7 +132,9 @@ public class FieldType implements WikittyTagValue, Serializable { */ public Object getContainedValidObject( Object value ) { // to permit simple migration from cardinality N to 1 for field - if (value != null && (value instanceof Collection || value.getClass().isArray())) { + if (value != null && (value instanceof Collection + // small exception for binary where primitive type is Array of byte + || (value.getClass().isArray() && type != WikittyTypes.BINARY))) { int size = CollectionUtils.size(value); if (size > 0) { value = CollectionUtils.get(value, 0); -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm