1.1 --- a/src/jdk/nashorn/internal/runtime/regexp/joni/BitStatus.java Mon Nov 03 07:29:46 2014 +0100 1.2 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/BitStatus.java Mon Nov 03 11:47:41 2014 +0100 1.3 @@ -34,7 +34,8 @@ 1.4 return (n < BIT_STATUS_BITS_NUM ? stats & (1 << n) : (stats & 1)) != 0; 1.5 } 1.6 1.7 - public static int bsOnAt(int stats, final int n) { 1.8 + public static int bsOnAt(final int statsp, final int n) { 1.9 + int stats = statsp; 1.10 if (n < BIT_STATUS_BITS_NUM) { 1.11 stats |= (1 << n); 1.12 } else { 1.13 @@ -43,12 +44,7 @@ 1.14 return stats; 1.15 } 1.16 1.17 - public static int bsOnOff(int v, final int f, final boolean negative) { 1.18 - if (negative) { 1.19 - v &= ~f; 1.20 - } else { 1.21 - v |= f; 1.22 - } 1.23 - return v; 1.24 + public static int bsOnOff(final int v, final int f, final boolean negative) { 1.25 + return negative ? (v & ~f) : (v | f); 1.26 } 1.27 }