Fix a bug with scala case classes causing debug to fail.

Sam Pullara · Sam Pullara · commit e8039c55b342 · 2012-08-08T09:50:47.000-07:00
diff --git a/compiler/src/main/java/com/github/mustachejava/DefaultMustacheFactory.java b/compiler/src/main/java/com/github/mustachejava/DefaultMustacheFactory.java
@@ -9,7 +9,15 @@
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
 
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.io.StringReader;
+import java.io.Writer;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 
@@ -36,8 +44,11 @@ public class DefaultMustacheFactory implements MustacheFactory {
    */
   protected final MustacheParser mc = new MustacheParser(this);
 
-  // New templates that are generated at runtime are cached here. The String
-  // key is the actual text of the templates, not a name.
+  /**
+   * New templates that are generated at runtime are cached here. The template key
+   * includes the text of the template and the context so we get proper error
+   * messages and debugging information.
+  */
   protected final LoadingCache<FragmentKey, Mustache> templateCache = createLambdaCache();
 
   private final String resourceRoot;
@@ -197,9 +208,9 @@ public Mustache load(String key) throws Exception {
 
   protected class FragmentCacheLoader extends CacheLoader<FragmentKey, Mustache> {
     @Override
-    public Mustache load(FragmentKey templateKey) throws Exception {
-      StringReader reader = new StringReader(templateKey.templateText);
-      TemplateContext tc = templateKey.tc;
+    public Mustache load(FragmentKey fragmentKey) throws Exception {
+      StringReader reader = new StringReader(fragmentKey.templateText);
+      TemplateContext tc = fragmentKey.tc;
       return compile(reader, tc.file(), tc.startChars(), tc.endChars());
     }
   }
diff --git a/compiler/src/main/java/com/github/mustachejava/reflect/GuardedBinding.java b/compiler/src/main/java/com/github/mustachejava/reflect/GuardedBinding.java
@@ -112,7 +112,17 @@ protected synchronized Wrapper getWrapper(String name, Object[] scopes) {
                   .append("in");
           for (Object scope : scopes) {
             if (scope != null) {
-              sb.append(" ").append(scope.getClass().getSimpleName());
+              Class aClass = scope.getClass();
+              try {
+                sb.append(" ").append(aClass.getSimpleName());
+              } catch (Exception e) {
+                // Some generated classes don't have simple names
+                try {
+                  sb.append(" ").append(aClass.getName());
+                } catch (Exception e1) {
+                  // Some generated classes have proper names at all
+                }
+              }
             }
           }
           logger.warning(sb.toString());
diff --git a/compiler/src/test/java/com/github/mustachejava/functions/TranslateBundleTest.java b/compiler/src/test/java/com/github/mustachejava/functions/TranslateBundleTest.java
@@ -16,14 +16,15 @@
 public class TranslateBundleTest {
 
   private static File root;
+  private static final String BUNDLE = "com.github.mustachejava.functions.translatebundle";
 
   @Test
   public void testTranslation() throws MustacheException, IOException, ExecutionException, InterruptedException {
     MustacheFactory c = new DefaultMustacheFactory(root);
     Mustache m = c.compile("translatebundle.html");
     StringWriter sw = new StringWriter();
-    Map scope = new HashMap();
-	scope.put("trans", new TranslateBundleFunction("com.github.mustachejava.functions.translatebundle", Locale.US));
+    Map<String, Object> scope = new HashMap<String, Object>();
+	  scope.put("trans", new TranslateBundleFunction(BUNDLE, Locale.US));
     m.execute(sw, scope);
     assertEquals(getContents(root, "translatebundle.txt"), sw.toString());
   }
