Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraradermache2012-07-06 16:19:53 -0400
committeraradermache2012-07-06 16:19:53 -0400
commitd99f078f3daa536e3cdf7571c37873eea0f03a5c (patch)
tree1bc1a603b2473b022c75c65cea7b07a8190f05b4 /plugins/infra
parent77c1e69507898130d440f5dd16b637996d49788c (diff)
downloadorg.eclipse.papyrus-d99f078f3daa536e3cdf7571c37873eea0f03a5c.tar.gz
org.eclipse.papyrus-d99f078f3daa536e3cdf7571c37873eea0f03a5c.tar.xz
org.eclipse.papyrus-d99f078f3daa536e3cdf7571c37873eea0f03a5c.zip
Corrected null-pointer exception in context of initial fix for bug 384164
Diffstat (limited to 'plugins/infra')
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/util/DecorationUtils.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/util/DecorationUtils.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/util/DecorationUtils.java
index 80bcaac5e9b..2b806cd8d71 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/util/DecorationUtils.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/util/DecorationUtils.java
@@ -185,7 +185,9 @@ public class DecorationUtils {
if(childDecorations != null) {
IDecorationSpecificFunctions decoUtil = DecorationSpecificFunctions.getDecorationInterface(type);
IPapyrusDecoration propagatedDecoration = decoUtil.markerPropagation(childDecorations);
- foundDecorations.add(propagatedDecoration);
+ if(propagatedDecoration != null) {
+ foundDecorations.add(propagatedDecoration);
+ }
}
}

Back to the top