cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1349020 - /cxf/branches/2.6.x-fixes/bin/DoMerges.java
Date Mon, 11 Jun 2012 21:24:52 GMT
Author: dkulp
Date: Mon Jun 11 21:24:52 2012
New Revision: 1349020

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

........
  r1348862 | dkulp | 2012-06-11 10:22:19 -0400 (Mon, 11 Jun 2012) | 2 lines

  Allow empty ranges

........

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=1349020&r1=1349019&r2=1349020&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/bin/DoMerges.java (original)
+++ cxf/branches/2.6.x-fixes/bin/DoMerges.java Mon Jun 11 21:24:52 2012
@@ -109,6 +109,9 @@ public class DoMerges {
         }
         public void optimize(Ranges blocked, Set<Integer> ignores) {
             Iterator<Range> it = this.iterator();
+            if (!it.hasNext()) {
+                return;
+            }
             Range last = it.next();
             while (it.hasNext()) {
                 Range r = it.next();



Mime
View raw message