svn commit: r1452056 - /shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/Renderer.java

[ss...@apache.org]

Author: ssievers
Date: Sun Mar  3 15:45:38 2013
New Revision: 1452056

URL: http://svn.apache.org/r1452056
Log:
Adding some more detailed logging when the locked domain service host validation fails for the rendering gadget and host.

Modified:
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/Renderer.java

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/Renderer.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/Renderer.java?rev=1452056&r1=1452055&r2=1452056&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/Renderer.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/Renderer.java Sun Mar  3 15:45:38 2013
@@ -27,6 +27,7 @@ import org.apache.shindig.gadgets.Gadget
 import org.apache.shindig.gadgets.LockedDomainService;
 import org.apache.shindig.gadgets.process.ProcessingException;
 import org.apache.shindig.gadgets.process.Processor;
+import org.apache.shindig.gadgets.spec.GadgetSpec;
 import org.apache.shindig.gadgets.spec.View;
 
 import com.google.inject.Inject;
@@ -77,10 +78,11 @@ public class Renderer {
     try {
       Gadget gadget = processor.process(context);
 
+      GadgetSpec gadgetSpec = gadget.getSpec();
       if (gadget.getCurrentView() == null) {
         return RenderingResults.error("Unable to locate an appropriate view in this gadget. " +
             "Requested: '" + gadget.getContext().getView() +
-            "' Available: " + gadget.getSpec().getViews().keySet(), HttpServletResponse.SC_NOT_FOUND);
+            "' Available: " + gadgetSpec.getViews().keySet(), HttpServletResponse.SC_NOT_FOUND);
       }
 
       if (gadget.getCurrentView().getType() == View.ContentType.URL) {
@@ -95,7 +97,9 @@ public class Renderer {
       }
 
       if (!lockedDomainService.isGadgetValidForHost(context.getHost(), gadget, context.getContainer())) {
-        return RenderingResults.error("Invalid domain", HttpServletResponse.SC_BAD_REQUEST);
+        return RenderingResults.error("Invalid domain for host (" + context.getHost()
+                + ") and gadget (" + gadgetSpec.getUrl() + ")",
+                HttpServletResponse.SC_BAD_REQUEST);
       }
 
       return RenderingResults.ok(renderer.render(gadget));