Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/src/share/vm/prims/jni.cpp	Tue Mar 12 00:02:16 2013 -0400
     1.2 +++ b/src/share/vm/prims/jni.cpp	Fri Mar 15 15:20:40 2013 -0400
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
     1.7   * Copyright (c) 2012 Red Hat, Inc.
     1.8   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.9   *
    1.10 @@ -92,7 +92,7 @@
    1.11  # include "os_bsd.inline.hpp"
    1.12  #endif
    1.13  
    1.14 -static jint CurrentVersion = JNI_VERSION_1_6;
    1.15 +static jint CurrentVersion = JNI_VERSION_1_8;
    1.16  
    1.17  
    1.18  // The DT_RETURN_MARK macros create a scoped object to fire the dtrace

     2.1 --- a/src/share/vm/prims/jni.h	Tue Mar 12 00:02:16 2013 -0400
     2.2 +++ b/src/share/vm/prims/jni.h	Fri Mar 15 15:20:40 2013 -0400
     2.3 @@ -1,5 +1,5 @@
     2.4  /*
     2.5 - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
     2.6 + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
     2.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.8   *
     2.9   * This code is free software; you can redistribute it and/or modify it
    2.10 @@ -1951,6 +1951,7 @@
    2.11  #define JNI_VERSION_1_2 0x00010002
    2.12  #define JNI_VERSION_1_4 0x00010004
    2.13  #define JNI_VERSION_1_6 0x00010006
    2.14 +#define JNI_VERSION_1_8 0x00010008
    2.15  
    2.16  #ifdef __cplusplus
    2.17  } /* extern "C" */

     3.1 --- a/src/share/vm/runtime/thread.cpp	Tue Mar 12 00:02:16 2013 -0400
     3.2 +++ b/src/share/vm/runtime/thread.cpp	Fri Mar 15 15:20:40 2013 -0400
     3.3 @@ -4061,6 +4061,7 @@
     3.4    if (version == JNI_VERSION_1_2) return JNI_TRUE;
     3.5    if (version == JNI_VERSION_1_4) return JNI_TRUE;
     3.6    if (version == JNI_VERSION_1_6) return JNI_TRUE;
     3.7 +  if (version == JNI_VERSION_1_8) return JNI_TRUE;
     3.8    return JNI_FALSE;
     3.9  }
    3.10