MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

we don't use local data if has stream provider

Browse Source
This commit is contained in:
Vladimir Krivosheev
2014-09-22 08:31:17 +02:00
parent b2a3afc006
commit a5d7e2d505
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/components/impl/stores/XmlElementStorage.java
+9 -11
View File
@@ -144,19 +144,18 @@ public abstract class XmlElementStorage implements StateStorage, Disposable {
StorageData result = createStorageData();
if (useProvidersData && myStreamProvider != null && myStreamProvider.isEnabled()) {
boolean wasLoaded = false;
try {
wasLoaded = loadDataFromStreamProvider(result);
loadDataFromStreamProvider(result);
//noinspection deprecation
if (!myStreamProvider.isVersioningRequired() && !(myStreamProvider instanceof OldStreamProviderAdapter || myStreamProvider instanceof CurrentUserHolder)) {
// we don't use local data if has stream provider (we don't use this logic for old stream providers)
return result;
}
}
catch (Exception e) {
LOG.warn(e);
}
//noinspection deprecation
if (wasLoaded && !myStreamProvider.isVersioningRequired() && !(myStreamProvider instanceof OldStreamProviderAdapter || myStreamProvider instanceof CurrentUserHolder)) {
// we don't use local data if stream provider has one (to preserve backward compatibility, we don't use this logic for old stream providers)
return result;
}
}
Element element = loadLocalData();
@@ -167,17 +166,16 @@ public abstract class XmlElementStorage implements StateStorage, Disposable {
return result;
}
private boolean loadDataFromStreamProvider(@NotNull StorageData result) throws IOException, JDOMException {
private void loadDataFromStreamProvider(@NotNull StorageData result) throws IOException, JDOMException {
assert myStreamProvider != null;
InputStream inputStream = myStreamProvider.loadContent(myFileSpec, myRoamingType);
if (inputStream == null) {
return false;
return;
}
Element element = JDOMUtil.loadDocument(inputStream).getRootElement();
filterOutOfDate(element);
loadState(result, element);
return true;
}
private void loadState(@NotNull StorageData result, @NotNull Element element) {