From 38019d1254e6b573788a655992bdb280ab0056e0 Mon Sep 17 00:00:00 2001
From: Thomas Mortagne <thomas.mortagne@gmail.com>
Date: Mon, 3 Oct 2016 16:31:08 +0200
Subject: [PATCH] XWIKI-13760: Repository Application is missing allowed
namespaces field in the class
---
.../org/xwiki/repository/internal/RepositoryManager.java | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-api/src/main/java/org/xwiki/repository/internal/RepositoryManager.java b/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-api/src/main/java/org/xwiki/repository/internal/RepositoryManager.java
index f77f7568f31..13dd38fc0d1 100644
--- a/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-api/src/main/java/org/xwiki/repository/internal/RepositoryManager.java
+++ b/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-api/src/main/java/org/xwiki/repository/internal/RepositoryManager.java
@@ -1072,6 +1072,13 @@ protected <T> T getValue(BaseObject object, String field, T def)
protected boolean update(BaseObject object, String fieldName, Object value)
{
+ // Make sure collection are lists
+ if (value instanceof Collection) {
+ if (!(value instanceof List)) {
+ value = new ArrayList<>((Collection) value);
+ }
+ }
+
if (ObjectUtils.notEqual(value, getValue(object, fieldName))) {
object.set(fieldName, value, this.xcontextProvider.get());
--
GitLab