Author: lindner
Date: Wed Jul 29 19:45:40 2009
New Revision: 799035
URL: http://svn.apache.org/viewvc?rev=799035&view=rev
Log:
SHINDIG-1133 | Patch from Gilles DEVAUX | NullPointerException in
RenderingGadgetRewriter
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriterTest.java
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java?rev=799035&r1=799034&r2=799035&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java
Wed Jul 29 19:45:40 2009
@@ -325,7 +325,8 @@
Iterator<String> missingIter = unsupported.iterator();
while (missingIter.hasNext()) {
String missing = missingIter.next();
- if (!features.get(missing).getRequired()) {
+ Feature feature = features.get(missing);
+ if (feature == null || !feature.getRequired()) {
missingIter.remove();
}
}
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriterTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriterTest.java?rev=799035&r1=799034&r2=799035&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriterTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriterTest.java
Wed Jul 29 19:45:40 2009
@@ -298,6 +298,8 @@
Gadget gadget = makeGadgetWithSpec(gadgetXml);
gadget.addFeature("foo");
+ // add non existing feature,
+ gadget.addFeature("do-not-exists");
featureRegistry.addInline("foo", "foo_content();");