cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1375644 - /cxf/branches/2.6.x-fixes/bin/DoMerges.java
Date Tue, 21 Aug 2012 16:13:46 GMT
Author: dkulp
Date: Tue Aug 21 16:13:46 2012
New Revision: 1375644

URL: http://svn.apache.org/viewvc?rev=1375644&view=rev
Log:
Merged revisions 1374268 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1374268 | dkulp | 2012-08-17 10:00:26 -0400 (Fri, 17 Aug 2012) | 2 lines

  Fix possible NPE

........

Modified:
    cxf/branches/2.6.x-fixes/bin/DoMerges.java

Modified: cxf/branches/2.6.x-fixes/bin/DoMerges.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/bin/DoMerges.java?rev=1375644&r1=1375643&r2=1375644&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/bin/DoMerges.java (original)
+++ cxf/branches/2.6.x-fixes/bin/DoMerges.java Tue Aug 21 16:13:46 2012
@@ -844,6 +844,9 @@ public class DoMerges {
     }
 
     private static boolean checkAlreadyMerged(List<String[]> gitLogs, String[] logLines)
throws IOException {
+        if (gitLogs == null) {
+            return false;
+        }
         for (String[] f : gitLogs) {
             if (compareLogs(f, logLines)) {
                 return true;



Mime
View raw message