[portal-commits] JBoss Portal SVN: r9529 - modules/common/trunk/common/src/main/java/org/jboss/portal/common/util.
Author: julien(a)jboss.com
Date: 2008-01-17 17:32:44 -0500 (Thu, 17 Jan 2008)
New Revision: 9529
Modified:
modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/TypedMap.java
Log:
just make code easier to debug
Modified:
modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/TypedMap.java
===================================================================
---
modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/TypedMap.java 2008-01-17
14:38:55 UTC (rev 9528)
+++
modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/TypedMap.java 2008-01-17
22:32:44 UTC (rev 9529)
@@ -206,7 +206,15 @@
IK ik = keyConverter.unwrap(ek);
IV iv = valueConverter.unwrap(ev);
iv = accessor.getMap(true).put(ik, iv);
- return iv == null ? null : valueConverter.wrap(iv);
+ if (iv == null)
+ {
+ ev = null;
+ }
+ else
+ {
+ ev = valueConverter.wrap(iv);
+ }
+ return ev;
}
public final EV get(Object key)
@@ -214,19 +222,25 @@
EK ek = (EK)key;
IK ik = keyConverter.unwrap(ek);
IV iv = accessor.getMap(false).get(ik);
- return iv == null ? null : valueConverter.wrap(iv);
+ EV ev = null;
+ if (iv != null)
+ {
+ ev = valueConverter.wrap(iv);
+ }
+ return ev;
}
public final EV remove(Object key)
{
EK ek = (EK)key;
IK ik = keyConverter.unwrap(ek);
- IV iv = null;
- if (!isEmpty())
+ IV iv = accessor.getMap(true).remove(ik);
+ EV ev = null;
+ if (iv != null)
{
- iv = accessor.getMap(true).remove(ik);
+ ev = valueConverter.wrap(iv);
}
- return iv == null ? null : valueConverter.wrap(iv);
+ return ev;
}
public final boolean containsValue(Object value)