You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cxf.apache.org by dk...@apache.org on 2012/08/17 16:00:27 UTC

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

Author: dkulp
Date: Fri Aug 17 14:00:26 2012
New Revision: 1374268

URL: http://svn.apache.org/viewvc?rev=1374268&view=rev
Log:
Fix possible NPE

Modified:
    cxf/trunk/bin/DoMerges.java

Modified: cxf/trunk/bin/DoMerges.java
URL: http://svn.apache.org/viewvc/cxf/trunk/bin/DoMerges.java?rev=1374268&r1=1374267&r2=1374268&view=diff
==============================================================================
--- cxf/trunk/bin/DoMerges.java (original)
+++ cxf/trunk/bin/DoMerges.java Fri Aug 17 14:00:26 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;