jdk/src/java.base/share/classes/java/util/Formatter.java

*** 1,7 ****
  /*
!  * Copyright (c) 2003, 2013, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 2003, 2015, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 55,64 ****
--- 55,65 ----
  import java.time.ZoneId;
  import java.time.ZoneOffset;
  import java.time.temporal.ChronoField;
  import java.time.temporal.TemporalAccessor;
  import java.time.temporal.TemporalQueries;
+ import java.time.temporal.UnsupportedTemporalTypeException;
  
  import sun.misc.DoubleConsts;
  import sun.misc.FormattedFloatingDecimal;
  
  /**
*** 4053,4063 ****
                      Flags flags = Flags.ZERO_PAD;
                      sb.append(localizedMagnitude(null, i, flags, 2, l));
                      break;
                  }
                  case DateTime.NANOSECOND:  { // 'N' (000000000 - 999999999)
!                     int i = t.get(ChronoField.MILLI_OF_SECOND) * 1000000;
                      Flags flags = Flags.ZERO_PAD;
                      sb.append(localizedMagnitude(null, i, flags, 9, l));
                      break;
                  }
                  case DateTime.MILLISECOND: { // 'L' (000 - 999)
--- 4054,4069 ----
                      Flags flags = Flags.ZERO_PAD;
                      sb.append(localizedMagnitude(null, i, flags, 2, l));
                      break;
                  }
                  case DateTime.NANOSECOND:  { // 'N' (000000000 - 999999999)
!                     int i;
!                     try {
!                         i = t.get(ChronoField.NANO_OF_SECOND);
!                     } catch (UnsupportedTemporalTypeException u) {
!                         i = t.get(ChronoField.MILLI_OF_SECOND) * 1000000;
!                     }
                      Flags flags = Flags.ZERO_PAD;
                      sb.append(localizedMagnitude(null, i, flags, 9, l));
                      break;
                  }
                  case DateTime.MILLISECOND: { // 'L' (000 - 999)