---

 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
--- core/src/org/openstreetmap/josm/actions/CombineWayAction.java~fix-cwa-warning	2009-10-30 16:51:32.000000000 -0700
+++ core-dave/src/org/openstreetmap/josm/actions/CombineWayAction.java	2009-10-30 16:54:14.000000000 -0700
@@ -582,7 +582,9 @@ public class CombineWayAction extends Jo
 
         protected List<NodePair> getOutboundPairs(Node node) {
             List<NodePair> l = successors.get(node);
-            return l == null ? Collections.EMPTY_LIST : l;
+            if (l == null)
+                return Collections.emptyList();
+            return l;
         }
 
         protected Set<Node> getNodes() {
diff -L +585 -puN /dev/null /dev/null
_