Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 49272 invoked from network); 26 Oct 2010 20:12:35 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 26 Oct 2010 20:12:35 -0000 Received: (qmail 58899 invoked by uid 500); 26 Oct 2010 20:12:35 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 58877 invoked by uid 500); 26 Oct 2010 20:12:35 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 58870 invoked by uid 99); 26 Oct 2010 20:12:35 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Oct 2010 20:12:35 +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; Tue, 26 Oct 2010 20:12:35 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id F0A4E23889EA; Tue, 26 Oct 2010 20:11:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1027719 - /activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/XmlCodec.java Date: Tue, 26 Oct 2010 20:11:38 -0000 To: commits@activemq.apache.org From: chirino@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101026201138.F0A4E23889EA@eris.apache.org> Author: chirino Date: Tue Oct 26 20:11:38 2010 New Revision: 1027719 URL: http://svn.apache.org/viewvc?rev=1027719&view=rev Log: Fixes property evaluation. Modified: activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/XmlCodec.java Modified: activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/XmlCodec.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/XmlCodec.java?rev=1027719&r1=1027718&r2=1027719&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/XmlCodec.java (original) +++ activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/XmlCodec.java Tue Oct 26 20:11:38 2010 @@ -42,7 +42,7 @@ public class XmlCodec { */ static public class PropertiesFilter extends StreamReaderDelegate { - static final Pattern pattern = Pattern.compile("\\$\\{[^\\}]\\}"); + static final Pattern pattern = Pattern.compile("\\$\\{([^\\}]+)\\}"); private final Properties props; public PropertiesFilter(XMLStreamReader parent, Properties props) {