svn commit: r1693466 - in /maven/shared/trunk/maven-reporting-impl/src: main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java

[rfscholte]

Author: rfscholte
Date: Thu Jul 30 18:23:40 2015
New Revision: 1693466

URL: http://svn.apache.org/r1693466
Log:
[MSHARED-392] AbstractMavenReportRenderer#applyPattern(String) chokes on some 
specific input and produces useless segments

Modified:
    
maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
    
maven/shared/trunk/maven-reporting-impl/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java

Modified: 
maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java?rev=1693466&r1=1693465&r2=1693466&view=diff
==============================================================================
--- 
maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
 (original)
+++ 
maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
 Thu Jul 30 18:23:40 2015
@@ -732,7 +732,7 @@ public abstract class AbstractMavenRepor
                         {
                             if ( braceStack == 0 )
                             {
-                                if ( i != 0 ) // handle { at first character
+                                if ( i != lastOffset ) // handle { at first 
character
                                 {
                                     segments.add( text.substring( lastOffset, 
i ) );
                                     segments.add( null );

Modified: 
maven/shared/trunk/maven-reporting-impl/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-reporting-impl/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java?rev=1693466&r1=1693465&r2=1693466&view=diff
==============================================================================
--- 
maven/shared/trunk/maven-reporting-impl/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java
 (original)
+++ 
maven/shared/trunk/maven-reporting-impl/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java
 Thu Jul 30 18:23:40 2015
@@ -111,5 +111,19 @@ public class AbstractMavenReportRenderer
 
         checkPattern( "{}test,", new String[] { "", null, "test,", null } );
         checkPattern( "Hi ${name}. How is it going, sir?", new String[] { "Hi 
${name}. How is it going, sir?", null } );
+
+        // MSHARED-392 multiple links
+        checkPattern( "{Indiana University Extreme! Lab Software License, 
vesion 1.1.1,"
+                        + 
"http://www.extreme.indiana.edu/viewcvs/~checkout~/XPP3/java/LICENSE.txt}";
+                        + "{Public 
Domain,http://creativecommons.org/licenses/publicdomain}";
+                        + "{Apache Software License, version 
1.1,http://www.apache.org/licenses/LICENSE-1.1}";,
+                                  new String[]{"Indiana University Extreme! 
Lab Software License, vesion 1.1.1", 
+                                      
"http://www.extreme.indiana.edu/viewcvs/~checkout~/XPP3/java/LICENSE.txt";,
+                                      "Public Domain",
+                                      
"http://creativecommons.org/licenses/publicdomain";,
+                                      "Apache Software License, version 1.1",
+                                      
"http://www.apache.org/licenses/LICENSE-1.1"});
+
+        
     }
 }