Return-Path: Delivered-To: apmail-jakarta-commons-dev-archive@www.apache.org Received: (qmail 9364 invoked from network); 5 Jun 2004 14:52:15 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 5 Jun 2004 14:52:15 -0000 Received: (qmail 18726 invoked by uid 500); 5 Jun 2004 14:52:13 -0000 Delivered-To: apmail-jakarta-commons-dev-archive@jakarta.apache.org Received: (qmail 18324 invoked by uid 500); 5 Jun 2004 14:52:10 -0000 Mailing-List: contact commons-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Jakarta Commons Developers List" Reply-To: "Jakarta Commons Developers List" Delivered-To: mailing list commons-dev@jakarta.apache.org Received: (qmail 18296 invoked by uid 500); 5 Jun 2004 14:52:10 -0000 Received: (qmail 18291 invoked by uid 99); 5 Jun 2004 14:52:10 -0000 Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.27.1) with SMTP; Sat, 05 Jun 2004 07:52:10 -0700 Received: (qmail 9283 invoked by uid 1773); 5 Jun 2004 14:52:09 -0000 Date: 5 Jun 2004 14:52:09 -0000 Message-ID: <20040605145209.9282.qmail@minotaur.apache.org> From: ozeigermann@apache.org To: jakarta-commons-sandbox-cvs@apache.org Subject: cvs commit: jakarta-commons-sandbox/transaction/src/java/org/apache/commons/transaction/memory TransactionalMapWrapper.java X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N ozeigermann 2004/06/05 07:52:09 Modified: transaction/src/java/org/apache/commons/transaction/memory TransactionalMapWrapper.java Log: Use putAll in merge for performance and simplicity Revision Changes Path 1.15 +6 -13 jakarta-commons-sandbox/transaction/src/java/org/apache/commons/transaction/memory/TransactionalMapWrapper.java Index: TransactionalMapWrapper.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/transaction/src/java/org/apache/commons/transaction/memory/TransactionalMapWrapper.java,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- TransactionalMapWrapper.java 4 Jun 2004 12:09:43 -0000 1.14 +++ TransactionalMapWrapper.java 5 Jun 2004 14:52:09 -0000 1.15 @@ -496,15 +496,8 @@ wrapped.clear(); } - for (Iterator it = changes.entrySet().iterator(); it.hasNext();) { - Map.Entry entry = (Map.Entry) it.next(); - wrapped.put(entry.getKey(), entry.getValue()); - } - - for (Iterator it = adds.entrySet().iterator(); it.hasNext();) { - Map.Entry entry = (Map.Entry) it.next(); - wrapped.put(entry.getKey(), entry.getValue()); - } + wrapped.putAll(changes); + wrapped.putAll(adds); for (Iterator it = deletes.iterator(); it.hasNext();) { Object key = it.next(); --------------------------------------------------------------------- To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: commons-dev-help@jakarta.apache.org