[454864] Excluding current profile from foreign definition search.
diff --git a/plugins/org.eclipse.uml2.uml/about.properties b/plugins/org.eclipse.uml2.uml/about.properties
index 29d9a3f..c2cce38 100644
--- a/plugins/org.eclipse.uml2.uml/about.properties
+++ b/plugins/org.eclipse.uml2.uml/about.properties
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2014 IBM Corporation, Embarcadero Technologies, CEA, and others.
+# Copyright (c) 2006, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -9,7 +9,7 @@
# Kenn Hussey (Embarcadero Technologies) - 219804, 204200
# Kenn Hussey - 323181
# Christian W. Damus (CEA) - 227616
-# Kenn Hussey (CEA) - 227616
+# Kenn Hussey (CEA) - 227616, 454864
#
# NLS_MESSAGEFORMAT_VAR
@@ -25,5 +25,5 @@
Version: {featureVersion}\n\
Build id: {0}\n\
\n\
-(c) Copyright Eclipse contributors and others 2003, 2014. All rights reserved.\n\
+(c) Copyright Eclipse contributors and others 2003, 2015. All rights reserved.\n\
Visit http://www.eclipse.org/uml2
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLUtil.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLUtil.java
index 193e710..58deaac 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLUtil.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLUtil.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2014 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -10,7 +10,7 @@
* Kenn Hussey (Embarcadero Technologies) - 199624, 184249, 204406, 208125, 204200, 213218, 213903, 220669, 208016, 226396, 271470
* Nicolas Rouquette (JPL) - 260120, 313837
* Kenn Hussey - 286329, 313601, 314971, 344907, 236184, 335125
- * Kenn Hussey (CEA) - 327039, 358792, 364419, 366350, 307343, 382637, 273949, 389542, 389495, 316165, 392833, 399544, 322715, 163556, 212765, 397324, 204658, 408612, 411731, 269598, 422000, 416833, 424568, 427167, 418466, 419324, 429994, 433157, 439915, 446388
+ * Kenn Hussey (CEA) - 327039, 358792, 364419, 366350, 307343, 382637, 273949, 389542, 389495, 316165, 392833, 399544, 322715, 163556, 212765, 397324, 204658, 408612, 411731, 269598, 422000, 416833, 424568, 427167, 418466, 419324, 429994, 433157, 439915, 446388, 454864
* Yann Tanguy (CEA) - 350402
* Christian W. Damus (CEA) - 392833, 251963, 405061, 409396, 176998, 180744, 403374, 416833, 420338, 405065, 431342
* E.D.Willink - 420338
@@ -8133,7 +8133,7 @@
Profile profile = (Profile) getOwningElement(type,
UMLPackage.Literals.PROFILE, true);
- if (profile != null) {
+ if (profile != null && profile != packages.iterator().next()) {
eType = (EClassifier) profile.getDefinition(type);
if (eType != null) {
