Author: lindner
Date: Tue Nov 16 00:00:48 2010
New Revision: 1035494
URL: http://svn.apache.org/viewvc?rev=1035494&view=rev
Log:
minor performance improvement keySet -> entrySet
Modified:
shindig/trunk/java/common/src/main/java/org/apache/shindig/config/BasicContainerConfig.java
Modified:
shindig/trunk/java/common/src/main/java/org/apache/shindig/config/BasicContainerConfig.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/config/BasicContainerConfig.java?rev=1035494&r1=1035493&r2=1035494&view=diff
==============================================================================
---
shindig/trunk/java/common/src/main/java/org/apache/shindig/config/BasicContainerConfig.java
(original)
+++
shindig/trunk/java/common/src/main/java/org/apache/shindig/config/BasicContainerConfig.java
Tue Nov 16 00:00:48 2010
@@ -291,9 +291,10 @@ public class BasicContainerConfig implem
// Clone the object with the parent values
Map<String, Object> clone = Maps.newHashMap(parentValues);
// Walk parameter list for the container and merge recursively.
- for (String field : container.keySet()) {
+ for (Map.Entry<String, Object> entry : container.entrySet()) {
+ String field = entry.getKey();
Object fromParents = clone.get(field);
- Object fromContainer = container.get(field);
+ Object fromContainer = entry.getValue();
// Merge if object type is Map
if (fromContainer instanceof Map<?, ?> && fromParents instanceof
Map<?, ?>) {
clone.put(field, mergeObjects(
