Merge pull request #727 from apache/fix/WW-5331-proper-get

[WW-5331] Uses proper signature of get()

plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletApplicationMap.java

@@ -35,8 +35,7 @@ public class PortletApplicationMap extends AbstractMap<String, Object> implement
 
     private static final long serialVersionUID = 2296107511063504414L;
 
-    private PortletContext context;
-
+    private final PortletContext context;
     private Set<Entry<String, Object>> entries;
 
     /**
@@ -52,6 +51,7 @@ public class PortletApplicationMap extends AbstractMap<String, Object> implement
      * Removes all entries from the Map and removes all attributes from the
      * portlet context.
      */
+    @Override
     public void clear() {
         entries = null;
 
@@ -69,6 +69,7 @@ public class PortletApplicationMap extends AbstractMap<String, Object> implement
      * @return a Set of all portlet context attributes as well as context init
      *         parameters.
      */
+    @Override
     public Set<Entry<String, Object>> entrySet() {
         if (entries == null) {
             entries = new HashSet<Entry<String, Object>>();
@@ -160,12 +161,16 @@ public class PortletApplicationMap extends AbstractMap<String, Object> implement
      * @return the portlet context attribute or init parameter or <tt>null</tt>
      *         if the entry is not found.
      */
-    public Object get(String key) {
+    @Override
+    public Object get(Object key) {
+        if (key == null) {
+            return null;
+        }
         // Try context attributes first, then init params
         // This gives the proper shadowing effects
-        Object value = context.getAttribute(key);
+        Object value = context.getAttribute(key.toString());
 
-        return (value == null) ? context.getInitParameter(key) : value;
+        return (value == null) ? context.getInitParameter(key.toString()) : value;
     }
 
     /**
@@ -177,6 +182,7 @@ public class PortletApplicationMap extends AbstractMap<String, Object> implement
      *            the value to set.
      * @return the attribute that was just set.
      */
+    @Override
     public Object put(String key, Object value) {
         entries = null;
         context.setAttribute(key, value);

plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletRequestMap.java

@@ -119,6 +119,9 @@ public class PortletRequestMap extends AbstractMap<String, Object> {
      * @return the request attribute or <tt>null</tt> if it doesn't exist.
      */
     public Object get(Object key) {
+        if (key == null) {
+            return null;
+        }
         return request.getAttribute(key.toString());
     }
 

plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletSessionMap.java

@@ -104,7 +104,7 @@ public class PortletSessionMap extends AbstractMap<String, Object> {
      */
     public Object get(Object key) {
         synchronized (session) {
-            return session.getAttribute(key.toString());
+            return session.getAttribute(key != null ? key.toString() : null);
         }
     }