Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgkessler2008-04-24 02:56:44 +0000
committergkessler2008-04-24 02:56:44 +0000
commit2dbd5f4a1abc291b93d459e899741330a14e9ba7 (patch)
tree0266f284fc40a359878dd307f0fef2779f461b81
parent888a18e6822309c48ee510bc1f6592607fe8a7a6 (diff)
downloadwebtools.jsf-2dbd5f4a1abc291b93d459e899741330a14e9ba7.tar.gz
webtools.jsf-2dbd5f4a1abc291b93d459e899741330a14e9ba7.tar.xz
webtools.jsf-2dbd5f4a1abc291b93d459e899741330a14e9ba7.zip
Fix for failing JUnit in I20080423192027. Something in EMF has changed, but this fix works around whatever that was.
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/impl/PaletteHelper.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/impl/PaletteHelper.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/impl/PaletteHelper.java
index 5d0ab8880..fc79558b2 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/impl/PaletteHelper.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/impl/PaletteHelper.java
@@ -326,7 +326,9 @@ public class PaletteHelper {
private static String getStringTagTraitValue(Entity entity, String key, String defaultValue){
Trait trait = TaglibDomainMetaDataQueryHelper.getTrait(entity, key);
if (trait != null){
- return TraitValueHelper.getValueAsString(trait);
+ String val = TraitValueHelper.getValueAsString(trait);
+ if (val != null)
+ return val;
}
return defaultValue;
}

Back to the top