Skip to content
This repository has been archived by the owner on Jul 24, 2024. It is now read-only.

Fixes #5097, fixed extension import to write files with correct id, which was causing project generation to fail #5127

Merged
merged 1 commit into from
Apr 3, 2019
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -305,9 +305,11 @@ private void importMissingExtensions(ZipInputStream zis, ZipEntry entry,

if( entry.getName().startsWith("extensions/") ) {
for (WithResourceId extension : imported.getOrDefault("extensions", Collections.emptyList())) {
final String extensionId = extension.getId().get();
// use extension's correlation Id with extension ZipEntry
final String extensionId = ((Extension)extension).getExtensionId();
if( entry.getName().equals("extensions/" + Names.sanitize(extensionId) + ".jar") ) {
String path = "/extensions/" + extensionId;
// path in filestore uses id instead of extensionId
String path = "/extensions/" + extension.getId().get();
InputStream existing = extensionDataManager.getExtensionDataAccess().read(path);
if( existing == null ) {
extensionDataManager.getExtensionDataAccess().write(path, zis);
Expand Down