Return-Path: Delivered-To: apmail-velocity-commits-archive@minotaur.apache.org Received: (qmail 55708 invoked from network); 2 Sep 2010 21:00:49 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 2 Sep 2010 21:00:49 -0000 Received: (qmail 85132 invoked by uid 500); 2 Sep 2010 21:00:49 -0000 Delivered-To: apmail-velocity-commits-archive@velocity.apache.org Received: (qmail 85092 invoked by uid 500); 2 Sep 2010 21:00:48 -0000 Mailing-List: contact commits-help@velocity.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@velocity.apache.org Delivered-To: mailing list commits@velocity.apache.org Received: (qmail 85085 invoked by uid 99); 2 Sep 2010 21:00:48 -0000 Received: from Unknown (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Sep 2010 21:00:48 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Sep 2010 21:00:31 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 88A9723889EA; Thu, 2 Sep 2010 21:00:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r992115 - /velocity/engine/trunk/src/java/org/apache/velocity/runtime/VelocimacroManager.java Date: Thu, 02 Sep 2010 21:00:10 -0000 To: commits@velocity.apache.org From: nbubna@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100902210010.88A9723889EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: nbubna Date: Thu Sep 2 21:00:10 2010 New Revision: 992115 URL: http://svn.apache.org/viewvc?rev=992115&view=rev Log: minor performance tweak Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/VelocimacroManager.java Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/VelocimacroManager.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/VelocimacroManager.java?rev=992115&r1=992114&r2=992115&view=diff ============================================================================== --- velocity/engine/trunk/src/java/org/apache/velocity/runtime/VelocimacroManager.java (original) +++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/VelocimacroManager.java Thu Sep 2 21:00:10 2010 @@ -259,9 +259,9 @@ public class VelocimacroManager */ public boolean dumpNamespace(final String namespace) { - synchronized(this) + if (usingNamespaces(namespace)) { - if (usingNamespaces(namespace)) + synchronized(this) { Map h = (Map) namespaceHash.remove(namespace); @@ -274,9 +274,8 @@ public class VelocimacroManager return true; } - - return false; } + return false; } /**