--- a/make/data/characterdata/CharacterDataLatin1.java.template	Fri Feb 02 12:34:58 2018 -0800
+++ b/make/data/characterdata/CharacterDataLatin1.java.template	Sat Feb 03 21:12:37 2018 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,6 @@
 
 package java.lang;
 
-import java.util.Arrays;
-
 /** The CharacterData class encapsulates the large tables found in
     Java.lang.Character. */
 
@@ -190,10 +188,8 @@
 
     int digit(int ch, int radix) {
         int value = DIGITS[ch];
-        if (value >= 0 && radix >= Character.MIN_RADIX && radix <= Character.MAX_RADIX) {
-            value = (value < radix) ? value : -1;
-        }
-        return value;
+        return (value >= 0 && value < radix && radix >= Character.MIN_RADIX
+                && radix <= Character.MAX_RADIX) ? value : -1;
     }
 
     int getNumericValue(int ch) {