svn commit: r1677610 - /myfaces/portlet-bridge/core/trunk/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/scope/BridgeRequestScopeRepository.java

[mk...@apache.org]

Author: mkienenb
Date: Mon May  4 14:48:10 2015
New Revision: 1677610

URL: http://svn.apache.org/r1677610
Log:
PORTLETBRIDGE-234 remove(String) in BridgeRequestScopeRepository and remove(Object) in HashMap have the same erasure. (Thanks to Ross Clewley for providing this patch)

Modified:
    myfaces/portlet-bridge/core/trunk/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/scope/BridgeRequestScopeRepository.java

Modified: myfaces/portlet-bridge/core/trunk/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/scope/BridgeRequestScopeRepository.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/scope/BridgeRequestScopeRepository.java?rev=1677610&r1=1677609&r2=1677610&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/scope/BridgeRequestScopeRepository.java (original)
+++ myfaces/portlet-bridge/core/trunk/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/scope/BridgeRequestScopeRepository.java Mon May  4 14:48:10 2015
@@ -23,8 +23,8 @@ import java.util.concurrent.ConcurrentMa
  * (access) a request scope by its key.
  */
 
-public class BridgeRequestScopeRepository<String, BridgeRequestScope extends ConcurrentMap<String, Object>>
-  extends LinkedHashMap<String, BridgeRequestScope>
+public class BridgeRequestScopeRepository<String, T extends BridgeRequestScope>
+  extends LinkedHashMap<String, T>
 {
   private static final long serialVersionUID = 4372455368577337965L;
 
@@ -40,7 +40,7 @@ public class BridgeRequestScopeRepositor
   }
 
   @Override
-  protected boolean removeEldestEntry(Map.Entry<String, BridgeRequestScope> eldest)
+  protected boolean removeEldestEntry(Map.Entry<String, T> eldest)
   {
     // manually remove the entry so we can ensure notifyPreDestroy is only
     // called once
@@ -52,9 +52,10 @@ public class BridgeRequestScopeRepositor
     return false;
   }
 
-  public BridgeRequestScope remove(String key)
+  @Override
+  public T remove(Object key)
   {
-    BridgeRequestScope scope = super.remove(key);
+    T scope = super.remove(key);
     // Note: clear() will call NotifyPreDestroy on elements in the scope being removed
     scope.clear();
     return scope;