# HG changeset patch
# User bobv
# Date 1363527045 25200
# Node ID 9e62e72c59cc33a83981ff5681c88dbd34bb9993
# Parent  7ae04e71af90ae1adb13b5e38d1aa24104d263ac# Parent  499ccc15bbc895992394f9a2360076dda7783af4
Merge

diff -r 7ae04e71af90 -r 9e62e72c59cc src/share/vm/prims/jni.cpp
--- a/src/share/vm/prims/jni.cpp	Fri Mar 15 11:44:33 2013 -0700
+++ b/src/share/vm/prims/jni.cpp	Sun Mar 17 06:30:45 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -92,7 +92,7 @@
 # include "os_bsd.inline.hpp"
 #endif
 
-static jint CurrentVersion = JNI_VERSION_1_6;
+static jint CurrentVersion = JNI_VERSION_1_8;
 
 
 // The DT_RETURN_MARK macros create a scoped object to fire the dtrace
diff -r 7ae04e71af90 -r 9e62e72c59cc src/share/vm/prims/jni.h
--- a/src/share/vm/prims/jni.h	Fri Mar 15 11:44:33 2013 -0700
+++ b/src/share/vm/prims/jni.h	Sun Mar 17 06:30:45 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -1951,6 +1951,7 @@
 #define JNI_VERSION_1_2 0x00010002
 #define JNI_VERSION_1_4 0x00010004
 #define JNI_VERSION_1_6 0x00010006
+#define JNI_VERSION_1_8 0x00010008
 
 #ifdef __cplusplus
 } /* extern "C" */
diff -r 7ae04e71af90 -r 9e62e72c59cc src/share/vm/runtime/thread.cpp
--- a/src/share/vm/runtime/thread.cpp	Fri Mar 15 11:44:33 2013 -0700
+++ b/src/share/vm/runtime/thread.cpp	Sun Mar 17 06:30:45 2013 -0700
@@ -4061,6 +4061,7 @@
   if (version == JNI_VERSION_1_2) return JNI_TRUE;
   if (version == JNI_VERSION_1_4) return JNI_TRUE;
   if (version == JNI_VERSION_1_6) return JNI_TRUE;
+  if (version == JNI_VERSION_1_8) return JNI_TRUE;
   return JNI_FALSE;
 }