could cause an npe. changing order.

spullara · spullara · commit 39f4096a15d6 · 2012-09-02T11:06:38.000-07:00
diff --git a/compiler/src/main/java/com/github/mustachejava/reflect/ClassGuard.java b/compiler/src/main/java/com/github/mustachejava/reflect/ClassGuard.java
@@ -33,6 +33,6 @@ public boolean equals(Object o) {
   public boolean apply(Object[] scopes) {
     if (scopes == null || scopes.length <= scopeIndex) return false;
     Object scope = scopes[scopeIndex];
-    return (scope != null && classGuard.equals(scope.getClass())) || (scope == null && classGuard == null);
+    return (scope == null && classGuard == null) || (scope != null && classGuard == scope.getClass());
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,6 @@ public boolean equals(Object o) {`
`33`	`33`	`public boolean apply(Object[] scopes) {`
`34`	`34`	`if (scopes == null \|\| scopes.length <= scopeIndex) return false;`
`35`	`35`	`Object scope = scopes[scopeIndex];`
`36`		`- return (scope != null && classGuard.equals(scope.getClass())) \|\| (scope == null && classGuard == null);`
	`36`	`+ return (scope == null && classGuard == null) \|\| (scope != null && classGuard == scope.getClass());`
`37`	`37`	`}`
`38`	`38`	`}`