Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(AutoReloadAssetTypeManager): synchronize methods to avoid NPE #102

Merged
merged 2 commits into from
Apr 27, 2021
Merged

fix(AutoReloadAssetTypeManager): synchronize methods to avoid NPE #102

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d80d57
fix(AutoReloadAssetTypeManager): synchronize methods to avoid Null Po…
keturn Apr 24, 2021
b68eeba
Merge remote-tracking branch 'origin/release/v7.x' into v7/fix/unsafe…
keturn Apr 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 11 additions & 23 deletions ...main/java/org/terasology/gestalt/assets/module/autoreload/AutoReloadAssetTypeManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,9 @@
/*
* Copyright 2019 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.gestalt.assets.module.autoreload;

import android.support.annotation.RequiresApi;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.terasology.gestalt.assets.Asset;
Expand All @@ -44,7 +30,7 @@ public class AutoReloadAssetTypeManager implements ModuleAwareAssetTypeManager {

private static final Logger logger = LoggerFactory.getLogger(AutoReloadAssetTypeManager.class);

private ModuleAwareAssetTypeManager assetTypeManager;
private final ModuleAwareAssetTypeManager assetTypeManager;
private AssetReloadOnChangeHandler reloadOnChangeHandler;

public AutoReloadAssetTypeManager() {
Expand All @@ -71,13 +57,13 @@ public synchronized void reloadChangedAssets() {
}
}

private <U extends AssetData, T extends Asset<U>> void registerAssetType(AssetType<T, U> assetType) {
private synchronized <U extends AssetData, T extends Asset<U>> void registerAssetType(AssetType<T, U> assetType) {
if (reloadOnChangeHandler != null) {
reloadOnChangeHandler.addAssetType(assetType, assetTypeManager.getAssetFileDataProducer(assetType));
}
}

private void openReloadOnChangeHandler(ModuleEnvironment newEnvironment) {
private synchronized void openReloadOnChangeHandler(ModuleEnvironment newEnvironment) {
try {
reloadOnChangeHandler = new AssetReloadOnChangeHandler(newEnvironment);
for (AssetType<?, ?> assetType : getAssetTypes()) {
Expand All @@ -88,7 +74,7 @@ private void openReloadOnChangeHandler(ModuleEnvironment newEnvironment) {
}
}

private void closeReloadOnChangeHandler() {
private synchronized void closeReloadOnChangeHandler() {
if (reloadOnChangeHandler != null) {
try {
reloadOnChangeHandler.close();
Expand Down Expand Up @@ -138,8 +124,10 @@ public <T extends Asset<U>, U extends AssetData> void removeAssetType(Class<T> t
assetTypeManager.getAssetType(type).ifPresent(
assetType -> {
assetTypeManager.removeAssetType(type);
if (reloadOnChangeHandler != null) {
reloadOnChangeHandler.removeAssetType(assetType);
synchronized (this) {
if (reloadOnChangeHandler != null) {
reloadOnChangeHandler.removeAssetType(assetType);
}
}
}
);
Expand All @@ -151,7 +139,7 @@ public AssetManager getAssetManager() {
}

@Override
public void switchEnvironment(ModuleEnvironment newEnvironment) {
public synchronized void switchEnvironment(ModuleEnvironment newEnvironment) {
closeReloadOnChangeHandler();
assetTypeManager.clearAvailableAssetCache();
assetTypeManager.switchEnvironment(newEnvironment);
Expand Down