changeset 11011:e6281218981c

Merge
author lana
date Thu, 02 Jul 2015 10:26:55 -0700
parents c4b37246b927 ceec4ff5c3f8
children 419bb499f8aa
files
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/make/profile-rtjar-includes.txt	Wed Jul 01 21:53:30 2015 -0700
+++ b/make/profile-rtjar-includes.txt	Thu Jul 02 10:26:55 2015 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 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
@@ -207,6 +207,8 @@
     javax/xml/bind \
     javax/xml/soap \
     javax/xml/ws \
+    jdk/internal/instrumentation \
+    jdk/management/resource \
     org/omg \
     sun/applet \
     sun/audio \
--- a/test/com/sun/crypto/provider/KeyFactory/TestProviderLeak.java	Wed Jul 01 21:53:30 2015 -0700
+++ b/test/com/sun/crypto/provider/KeyFactory/TestProviderLeak.java	Thu Jul 02 10:26:55 2015 -0700
@@ -66,9 +66,9 @@
                 megaByte = new byte [MB];
                 data.add(megaByte);
             } catch (OutOfMemoryError e) {
+                megaByte = null;    // Free memory ASAP
                 System.out.println("OOME is thrown when allocating "
                         + data.size() + "MB memory.");
-                megaByte = null;
 
                 for (int j = 0; j < RESERVATION && !data.isEmpty(); j++) {
                     data.removeLast();