svn commit: r1348866 - /cxf/trunk/bin/DoMerges.java

[dkulp]

Author: dkulp
Date: Mon Jun 11 14:30:07 2012
New Revision: 1348866

URL: http://svn.apache.org/viewvc?rev=1348866&view=rev
Log:
Handle multi-line props

Modified:
    cxf/trunk/bin/DoMerges.java

Modified: cxf/trunk/bin/DoMerges.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/bin/DoMerges.java?rev=1348866&r1=1348865&r2=1348866&view=diff
==============================================================================
--- cxf/trunk/bin/DoMerges.java (original)
+++ cxf/trunk/bin/DoMerges.java Mon Jun 11 14:30:07 2012
@@ -260,7 +260,9 @@ public class DoMerges {
         line = reader.readLine();
         while (line != null) {
             int idx = line.indexOf(':');
-            parseRevs(line.substring(idx + 1), blocked);
+            if (idx != -1) {
+                parseRevs(line.substring(idx + 1).trim(), blocked);
+            }
             line = reader.readLine();
         } 
         p.waitFor();