Index: /trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java	(revision 11113)
+++ /trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java	(revision 11114)
@@ -77,5 +77,4 @@
                 .setIcon(JOptionPane.INFORMATION_MESSAGE)
                 .show();
-        return;
     }
 
Index: /trunk/test/performance/org/openstreetmap/josm/data/osm/KeyValuePerformanceTest.java
===================================================================
--- /trunk/test/performance/org/openstreetmap/josm/data/osm/KeyValuePerformanceTest.java	(revision 11113)
+++ /trunk/test/performance/org/openstreetmap/josm/data/osm/KeyValuePerformanceTest.java	(revision 11114)
@@ -2,4 +2,5 @@
 package org.openstreetmap.josm.data.osm;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotSame;
@@ -66,5 +67,5 @@
         for (int i = 0; i < STRING_INTERN_TESTS; i++) {
             // warm up
-            assertTrue(str1.equals(str1B));
+            assertEquals(str1, str1B);
         }
 
@@ -77,5 +78,5 @@
         timer = PerformanceTestUtils.startTimer("str1.equals(str2) succeeds (without intern)");
         for (int i = 0; i < STRING_INTERN_TESTS; i++) {
-            assertTrue(str1.equals(str1B));
+            assertEquals(str1, str1B);
         }
         timer.done();