Author: sebb
Date: Sat Jan 11 13:11:56 2014
New Revision: 1557381
URL: http://svn.apache.org/r1557381
Log:
Generics
Modified:
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/util/MapUtils.java
Modified:
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/util/MapUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/util/MapUtils.java?rev=1557381&r1=1557380&r2=1557381&view=diff
==============================================================================
---
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/util/MapUtils.java
(original)
+++
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/util/MapUtils.java
Sat Jan 11 13:11:56 2014
@@ -83,7 +83,7 @@ public class MapUtils
*/
public static <K, V> Map<K, V> merge(final Map<K, V> lhs, final Map<K, V>
rhs) {
- Map result = null;
+ Map<K, V> result = null;
if (lhs == null || lhs.size() == 0) {
result = copy(rhs);