SEAMFACES-33 Fixed the annotation return type for the Qualifier cache

seam · Mar 23, 2011 · 6861cc7 · 6861cc7
1 parent 1b2de43
commit 6861cc7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/impl/src/main/java/org/jboss/seam/faces/view/config/ViewConfigSecurityEnforcer.java b/impl/src/main/java/org/jboss/seam/faces/view/config/ViewConfigSecurityEnforcer.java
@@ -24,7 +24,7 @@
 @Requires("org.jboss.seam.security.extension.SecurityExtension")
 public class ViewConfigSecurityEnforcer
 {
-   private static final Logger log = Logger.getLogger(ViewConfigSecurityEnforcer.class);
+   private transient final Logger log = Logger.getLogger(ViewConfigSecurityEnforcer.class);
 
    @Inject
    private ViewConfigStore viewConfigStore;

diff --git a/impl/src/main/java/org/jboss/seam/faces/view/config/ViewConfigStoreImpl.java b/impl/src/main/java/org/jboss/seam/faces/view/config/ViewConfigStoreImpl.java
@@ -23,7 +23,7 @@
 @ApplicationScoped
 public class ViewConfigStoreImpl implements ViewConfigStore
 {
-   private static final Logger log = Logger.getLogger(ViewConfigSecurityEnforcer.class);
+   private transient final Logger log = Logger.getLogger(ViewConfigSecurityEnforcer.class);
    /**
     * cache of viewId to a given data list
     */
@@ -81,7 +81,7 @@ public synchronized void addAnnotationData(String viewId, Annotation annotation)
             viewPatternDataByQualifier.put(qualifier.annotationType(), qualifierMap);
             log.infof("Putting new qualifier map for qualifier type %s", qualifier.annotationType().getName());
          }
-         qualifierMap.put(viewId, qualifier);
+         qualifierMap.put(viewId, annotation);
       }
    }
 

diff --git a/impl/src/test/java/org/jboss/seam/faces/test/view/config/ViewConfigStoreTest.java b/impl/src/test/java/org/jboss/seam/faces/test/view/config/ViewConfigStoreTest.java
@@ -60,5 +60,6 @@ public void testViewConfigStoreQualified()
       List<? extends Annotation> qdlist;
       qdlist = store.getAllQualifierData("/qualified/yes.xhtml", TestQualifier.class);
       Assert.assertEquals(1, qdlist.size());
+      Assert.assertEquals("qualified.gif", ((QualifiedIcon) qdlist.get(0)).value());
    }
 }