Return-Path: X-Original-To: apmail-maven-commits-archive@www.apache.org Delivered-To: apmail-maven-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CB7091008E for ; Tue, 11 Feb 2014 22:31:06 +0000 (UTC) Received: (qmail 75974 invoked by uid 500); 11 Feb 2014 22:31:05 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 75827 invoked by uid 500); 11 Feb 2014 22:31:04 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 75820 invoked by uid 99); 11 Feb 2014 22:31:04 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Feb 2014 22:31:04 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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, 11 Feb 2014 22:31:01 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 158DB23888E4; Tue, 11 Feb 2014 22:30:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1567425 - in /maven/shared/trunk/maven-filtering/src: main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java Date: Tue, 11 Feb 2014 22:30:39 -0000 To: commits@maven.apache.org From: rfscholte@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140211223040.158DB23888E4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rfscholte Date: Tue Feb 11 22:30:39 2014 New Revision: 1567425 URL: http://svn.apache.org/r1567425 Log: [MSHARED-199] Filtering doesn't work if 2 delimiters are used on the same line, the first one being left open Modified: maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java Modified: maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java?rev=1567425&r1=1567424&r2=1567425&view=diff ============================================================================== --- maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java (original) +++ maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java Tue Feb 11 22:30:39 2014 @@ -410,6 +410,12 @@ public class MultiDelimiterInterpolatorF throw error; } } + else + { + // no endtoken? Write current char and continue in search for next expression + in.reset(); + return in.read(); + } // write away the value if present, otherwise the key unmodified if ( value != null ) Modified: maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java?rev=1567425&r1=1567424&r2=1567425&view=diff ============================================================================== --- maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java (original) +++ maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java Tue Feb 11 22:30:39 2014 @@ -176,4 +176,20 @@ public class DefaultMavenFileFilterTest reader = wrappers.get( 0 ).getReader( new StringReader( "abcFILTER.a.MEabc" ) ); assertEquals( "DONE", IOUtil.toString( reader ) ); } + + // MSHARED-199: Filtering doesn't work if 2 delimiters are used on the same line, the first one being left open + public void testLineWithSingleAtAndExpression() throws Exception + { + MavenFileFilter mavenFileFilter = (MavenFileFilter) lookup( MavenFileFilter.class.getName(), "default" ); + + AbstractMavenFilteringRequest req = new AbstractMavenFilteringRequest(); + Properties additionalProperties = new Properties(); + additionalProperties.setProperty( "foo", "bar" ); + req.setAdditionalProperties( additionalProperties ); + + List wrappers = mavenFileFilter.getDefaultFilterWrappers( req ); + + Reader reader = wrappers.get( 0 ).getReader( new StringReader( "toto@titi.com ${foo}" ) ); + assertEquals( "toto@titi.com bar", IOUtil.toString( reader ) ); + } }