From 6b552f06594d39fc402a070b443e195dec1fd48a Mon Sep 17 00:00:00 2001 From: Christian Dietrich Date: Mon, 20 Jan 2020 12:50:55 +0100 Subject: [PATCH] [eclipse/xtext#1651] made error handling in StorageAwareResource null-safe Signed-off-by: Christian Dietrich --- .../xtext/resource/persistence/StorageAwareResource.xtend | 4 ++-- .../xtext/resource/persistence/StorageAwareResource.java | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/org.eclipse.xtext/src/org/eclipse/xtext/resource/persistence/StorageAwareResource.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/resource/persistence/StorageAwareResource.xtend index 9eb450b93..d608317c2 100644 --- a/org.eclipse.xtext/src/org/eclipse/xtext/resource/persistence/StorageAwareResource.xtend +++ b/org.eclipse.xtext/src/org/eclipse/xtext/resource/persistence/StorageAwareResource.xtend @@ -44,8 +44,8 @@ class StorageAwareResource extends LazyLinkingResource { return; } catch(IOException e) { // revert the resource into a clean state - contents.clear - eAdapters.clear + contents?.clear + eAdapters?.clear unload } } diff --git a/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/resource/persistence/StorageAwareResource.java b/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/resource/persistence/StorageAwareResource.java index 6d7b2efec..6b036ebf3 100644 --- a/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/resource/persistence/StorageAwareResource.java +++ b/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/resource/persistence/StorageAwareResource.java @@ -68,8 +68,12 @@ public class StorageAwareResource extends LazyLinkingResource { return; } catch (final Throwable _t) { if (_t instanceof IOException) { - this.contents.clear(); - this.eAdapters.clear(); + if (this.contents!=null) { + this.contents.clear(); + } + if (this.eAdapters!=null) { + this.eAdapters.clear(); + } this.unload(); } else { throw Exceptions.sneakyThrow(_t);