Author: mrisaliti
Date: Fri Mar 4 23:02:44 2011
New Revision: 1078198
URL:
http://svn.apache.org/viewvc?rev=1078198&view=revLog:
Remove some warning in MapContext (OFBIZ-4102)
Modified:
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/MapContext.java
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/MapContext.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/MapContext.java?rev=1078198&r1=1078197&r2=1078198&view=diff==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/MapContext.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/MapContext.java Fri Mar 4 23:02:44 2011
@@ -226,7 +226,7 @@ public class MapContext<K, V> implements
for (Map<K, V> curMap: this.stackList) {
// only return if the curMap contains the key, rather than checking for null; this allows a null at a lower level to override a value at a higher level
if (curMap.containsKey(name)) {
- if (curMap instanceof LocalizedMap) {
+ if (curMap instanceof LocalizedMap<?>) {
LocalizedMap<V> lmap = UtilGenerics.cast(curMap);
return lmap.get(name, locale);
} else {
@@ -332,7 +332,7 @@ public class MapContext<K, V> implements
fullMapString.append(curEntry.getKey());
fullMapString.append("]:");
// skip the instances of MapContext to avoid infinite loop
- if (curEntry.getValue() instanceof MapContext) {
+ if (curEntry.getValue() instanceof MapContext<?, ?>) {
fullMapString.append("<Instance of MapContext, not printing to avoid infinite recursion>");
} else {
fullMapString.append(curEntry.getValue());