fix(ComponentFieldMetadata): do not pass null to CopyStrategy
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
package org.terasology.engine.entitySystem.metadata;
import org.terasology.reflection.copy.CopyStrategyLibrary;
*/
public class ComponentFieldMetadata<T extends Component, U> extends ReplicatedFieldMetadata<T, U> {
- private boolean ownedReference;
+ private final boolean ownedReference;
- private CopyStrategy<U> copyWithOwnedEntitiesStrategy;
+ private final CopyStrategy<U> copyWithOwnedEntitiesStrategy;
public ComponentFieldMetadata(ClassMetadata<T, ?> owner, Field field, CopyStrategyLibrary copyStrategyLibrary, ReflectFactory factory, boolean replicatedByDefault)
throws InaccessibleFieldException {
@@ -73,7 +60,8 @@ private boolean isCollectionOf(Class<?> targetType, Type genericType) {
* @return A safe to use copy of the value of this field in the given object
*/
public U getCopyOfValueWithOwnedEntities(Object from) {
- return copyWithOwnedEntitiesStrategy.copy(getValue(from));
+ U value = getValue(from);
+ return (value != null) ? copyWithOwnedEntitiesStrategy.copy(value) : null;
}
/**
