svn commit: r664647 - in /incubator/shindig/trunk/java/gadgets/src: main/java/org/apache/shindig/gadgets/ test/java/org/apache/shindig/gadgets/ test/java/org/apache/shindig/gadgets/servlet/

[etnu]

Author: etnu
Date: Mon Jun  9 00:43:12 2008
New Revision: 664647

URL: http://svn.apache.org/viewvc?rev=664647&view=rev
Log:
Added null check for BasicMessageBundleFactory.getBundle(LocaleSpec, 
GadgetContext))


Modified:
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicMessageBundleFactory.java
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetServer.java
    
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/BasicMessageBundleFactoryTest.java
    
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HttpTestFixture.java

Modified: 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicMessageBundleFactory.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicMessageBundleFactory.java?rev=664647&r1=664646&r2=664647&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicMessageBundleFactory.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicMessageBundleFactory.java
 Mon Jun  9 00:43:12 2008
@@ -49,6 +49,9 @@
 
   public MessageBundle getBundle(LocaleSpec localeSpec, GadgetContext context)
       throws GadgetException {
+    if (localeSpec == null) {
+      return MessageBundle.EMPTY;
+    }
     URI messages = localeSpec.getMessages();
     if (messages == null || messages.toString().length() == 0) {
       return localeSpec.getMessageBundle();

Modified: 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetServer.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetServer.java?rev=664647&r1=664646&r2=664647&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetServer.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetServer.java
 Mon Jun  9 00:43:12 2008
@@ -129,7 +129,7 @@
     spec = spec.substitute(substituter, !context.getIgnoreCache());
 
     Collection<JsLibrary> jsLibraries = getLibraries(spec, context);
-    Gadget gadget = new Gadget(context, spec, bundle, jsLibraries);
+    Gadget gadget = new Gadget(context, spec, jsLibraries);
     startPreloads(gadget);
     return gadget;
   }

Modified: 
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/BasicMessageBundleFactoryTest.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/BasicMessageBundleFactoryTest.java?rev=664647&r1=664646&r2=664647&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/BasicMessageBundleFactoryTest.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/BasicMessageBundleFactoryTest.java
 Mon Jun  9 00:43:12 2008
@@ -140,4 +140,10 @@
 
     assertEquals(MSG_0_VALUE, bundle2.getMessages().get(MSG_0_NAME));
   }
+
+  @Test
+  public void badLocaleGetsEmptyBundle() throws Exception {
+    assertEquals(0,
+        bundleFactory.getBundle(null, NO_CACHE_CONTEXT).getMessages().size());
+  }
 }

Modified: 
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HttpTestFixture.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HttpTestFixture.java?rev=664647&r1=664646&r2=664647&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HttpTestFixture.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HttpTestFixture.java
 Mon Jun  9 00:43:12 2008
@@ -42,8 +42,8 @@
         securityTokenDecoder,
         lockedDomainService,
         rewriter);
-    gadgetRenderer = new GadgetRenderingTask(gadgetServer, registry,
-        containerConfig, urlGenerator, securityTokenDecoder, 
lockedDomainService);
+    gadgetRenderer = new GadgetRenderingTask(gadgetServer, bundleFactory,
+        registry, containerConfig, urlGenerator, securityTokenDecoder, 
lockedDomainService);
     jsonRpcHandler = new JsonRpcHandler(executor, gadgetServer, urlGenerator);
   }
 }