Ticket #3820: fix-cwa-warning.patch

File fix-cwa-warning.patch, 937 bytes (added by hansendc, 16 years ago)
  • (a) core/src/org/openstreetmap/josm/actions/CombineWayAction.java~fix-cwa-warning vs. (b) core-dave/src/org/openstreetmap/josm/actions/CombineWayAction.java

    
    ---
    
     core-dave/src/org/openstreetmap/josm/actions/CombineWayAction.java |    4 +++-
     1 file changed, 3 insertions(+), 1 deletion(-)
    
    diff -puN src/org/openstreetmap/josm/actions/CombineWayAction.java~fix-cwa-warning src/org/openstreetmap/josm/actions/CombineWayAction.java
    a b public class CombineWayAction extends Jo  
    582582
    583583        protected List<NodePair> getOutboundPairs(Node node) {
    584584            List<NodePair> l = successors.get(node);
    585             return l == null ? Collections.EMPTY_LIST : l;
     585            if (l == null)
     586                return Collections.emptyList();
     587            return l;
    586588        }
    587589
    588590        protected Set<Node> getNodes() {