cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1337155 - /cxf/trunk/bin/DoMerges.java
Date Fri, 11 May 2012 13:38:48 GMT
Author: dkulp
Date: Fri May 11 13:38:48 2012
New Revision: 1337155

URL: http://svn.apache.org/viewvc?rev=1337155&view=rev
Log:
svn info seems to have changed format slightly (empty line returned)

Modified:
    cxf/trunk/bin/DoMerges.java

Modified: cxf/trunk/bin/DoMerges.java
URL: http://svn.apache.org/viewvc/cxf/trunk/bin/DoMerges.java?rev=1337155&r1=1337154&r2=1337155&view=diff
==============================================================================
--- cxf/trunk/bin/DoMerges.java (original)
+++ cxf/trunk/bin/DoMerges.java Fri May 11 13:38:48 2012
@@ -232,16 +232,18 @@ public class DoMerges {
         line = reader.readLine();
         while (line != null) {
             int idx = line.indexOf(':');
-            propSource = line.substring(0, idx);
-            svnSource = svnRoot + propSource;
-            if (isGit) {
-                gitSource = line.substring(0, idx);
-                if (gitSource.contains("/")) {
-                    gitSource = gitSource.substring(gitSource.lastIndexOf('/') + 1);
+            if (idx != -1) {
+                propSource = line.substring(0, idx);
+                svnSource = svnRoot + propSource;
+                if (isGit) {
+                    gitSource = line.substring(0, idx);
+                    if (gitSource.contains("/")) {
+                        gitSource = gitSource.substring(gitSource.lastIndexOf('/') + 1);
+                    }
+                    gitSource = "origin/" + gitSource;
                 }
-                gitSource = "origin/" + gitSource;
+                parseRevs(line.substring(idx + 1), merged);
             }
-            parseRevs(line.substring(idx + 1), merged);
             line = reader.readLine();
         } 
         p.waitFor();



Mime
View raw message