Index: trunk/src/org/openstreetmap/josm/data/validation/tests/Highways.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/tests/Highways.java	(revision 14774)
+++ trunk/src/org/openstreetmap/josm/data/validation/tests/Highways.java	(revision 14775)
@@ -250,8 +250,6 @@
         Node n = way.getNode(nodePos);
         int oneway = way.isOneway();
-        if (oneway == 0) {
-            if ("roundabout".equals(way.get("junction"))) {
-                oneway = 1;
-            }
+        if (oneway == 0 && "roundabout".equals(way.get("junction"))) {
+            oneway = 1;
         }
 
@@ -291,8 +289,6 @@
     private static boolean onlySharpAngle(Node common, Node from, Way toWay) {
         int oneway = toWay.isOneway();
-        if (oneway == 0) {
-            if ("roundabout".equals(toWay.get("junction"))) {
-                oneway = 1;
-            }
+        if (oneway == 0 && "roundabout".equals(toWay.get("junction"))) {
+            oneway = 1;
         }