sigmasternchen/xtext-core
1
0
Fork 0
mirror of https://github.com/sigmasternchen/xtext-core synced 2025-03-16 08:48:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #186 from eclipse/maintenance

Browse source 
Merge fixes from maintenance into master
This commit is contained in:
Sebastian Zarnekow 2015-04-23 17:17:54 +02:00
commit aecc2d679c
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/persistence/PortableURIs.xtend
View file

@ -89,7 +89,7 @@ class PortableURIs {
def URI toPortableURI(StorageAwareResource sourceResource, URI targetURI) {
val to = sourceResource.resourceSet.getResource(targetURI.trimFragment, false)?.getEObject(targetURI.fragment)
// if it points to some registered ecore, there's no resourceSet and the result is not portable
if (to == null || to.eResource.resourceSet != null) {
if (to == null || to.eResource?.resourceSet != null) {
val result = toPortableURI(sourceResource, to);
if (result != null) {
return result