From 73a89bec2921a706abdfe19374e4a401456b73d0 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Mon, 15 Jan 2018 15:40:01 +0100 Subject: [PATCH] IDEA-184929 JDOMExternalizableStringList must not require `class` attribute (cherry picked from commit b07b9a4) --- .../util/JDOMExternalizableStringList.java | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/platform/util/src/com/intellij/openapi/util/JDOMExternalizableStringList.java b/platform/util/src/com/intellij/openapi/util/JDOMExternalizableStringList.java index d146bd606b22..cfce4b8d0f3a 100644 --- a/platform/util/src/com/intellij/openapi/util/JDOMExternalizableStringList.java +++ b/platform/util/src/com/intellij/openapi/util/JDOMExternalizableStringList.java @@ -1,17 +1,5 @@ /* - * Copyright 2000-2017 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.intellij.openapi.util; @@ -70,7 +58,7 @@ public class JDOMExternalizableStringList extends ArrayList implements J String itemClassString = listItemElement.getAttributeValue(ATTR_CLASS); Class itemClass; try { - itemClass = Class.forName(itemClassString, true, classLoader); + itemClass = itemClassString == null ? String.class : Class.forName(itemClassString, true, classLoader); } catch (ClassNotFoundException ex) { throw new IllegalDataException("Unable to read list item: unable to load class: " + itemClassString + " \n" + ex.getMessage());