*** old/src/java.base/share/classes/java/nio/Bits.java	Fri Feb  5 13:30:06 2016
--- new/src/java.base/share/classes/java/nio/Bits.java	Fri Feb  5 13:30:06 2016

*** 1,7 ****
--- 1,7 ----
  /*
!  * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 2000, 2016, 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

*** 806,816 ****
--- 806,816 ----
              offset += size;
          }
      }
  
      /**
!      * Copy and unconditionally byte swap 16 bit elements from a heap array to off-heap memory
       *
       * @param src
       *        the source array, must be a 16-bit primitive array type
       * @param srcPos
       *        byte offset within source array of the first element to read

*** 822,832 ****
--- 822,832 ----
      static void copyFromCharArray(Object src, long srcPos, long dstAddr, long length) {
          unsafe.copySwapMemory(src, unsafe.arrayBaseOffset(src.getClass()) + srcPos, null, dstAddr, length, 2);
      }
  
      /**
!      * Copy and unconditionally byte swap 16 bit elements from off-heap memory to a heap array
       *
       * @param srcAddr
       *        source address
       * @param dst
       *        destination array, must be a 16-bit primitive array type

*** 838,848 ****
--- 838,848 ----
      static void copyToCharArray(long srcAddr, Object dst, long dstPos, long length) {
          unsafe.copySwapMemory(null, srcAddr, dst, unsafe.arrayBaseOffset(dst.getClass()) + dstPos, length, 2);
      }
  
      /**
!      * Copy and unconditionally byte swap 16 bit elements from a heap array to off-heap memory
       *
       * @param src
       *        the source array, must be a 16-bit primitive array type
       * @param srcPos
       *        byte offset within source array of the first element to read

*** 854,864 ****
--- 854,864 ----
      static void copyFromShortArray(Object src, long srcPos, long dstAddr, long length) {
          unsafe.copySwapMemory(src, unsafe.arrayBaseOffset(src.getClass()) + srcPos, null, dstAddr, length, 2);
      }
  
      /**
!      * Copy and unconditionally byte swap 16 bit elements from off-heap memory to a heap array
       *
       * @param srcAddr
       *        source address
       * @param dst
       *        destination array, must be a 16-bit primitive array type

*** 870,880 ****
--- 870,880 ----
      static void copyToShortArray(long srcAddr, Object dst, long dstPos, long length) {
          unsafe.copySwapMemory(null, srcAddr, dst, unsafe.arrayBaseOffset(dst.getClass()) + dstPos, length, 2);
      }
  
      /**
!      * Copy and unconditionally byte swap 32 bit elements from a heap array to off-heap memory
       *
       * @param src
       *        the source array, must be a 32-bit primitive array type
       * @param srcPos
       *        byte offset within source array of the first element to read

*** 886,896 ****
--- 886,896 ----
      static void copyFromIntArray(Object src, long srcPos, long dstAddr, long length) {
          unsafe.copySwapMemory(src, unsafe.arrayBaseOffset(src.getClass()) + srcPos, null, dstAddr, length, 4);
      }
  
      /**
!      * Copy and unconditionally byte swap 32 bit elements from off-heap memory to a heap array
       *
       * @param srcAddr
       *        source address
       * @param dst
       *        destination array, must be a 32-bit primitive array type

*** 902,912 ****
--- 902,912 ----
      static void copyToIntArray(long srcAddr, Object dst, long dstPos, long length) {
          unsafe.copySwapMemory(null, srcAddr, dst, unsafe.arrayBaseOffset(dst.getClass()) + dstPos, length, 4);
      }
  
      /**
!      * Copy and unconditionally byte swap 64 bit elements from a heap array to off-heap memory
       *
       * @param src
       *        the source array, must be a 64-bit primitive array type
       * @param srcPos
       *        byte offset within source array of the first element to read

*** 918,928 ****
--- 918,928 ----
      static void copyFromLongArray(Object src, long srcPos, long dstAddr, long length) {
          unsafe.copySwapMemory(src, unsafe.arrayBaseOffset(src.getClass()) + srcPos, null, dstAddr, length, 8);
      }
  
      /**
!      * Copy and unconditionally byte swap 64 bit elements from off-heap memory to a heap array
       *
       * @param srcAddr
       *        source address
       * @param dst
       *        destination array, must be a 64-bit primitive array type