Merge

make/profile-rtjar-includes.txt

 #
-# 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 @@ FULL_JRE_RTJAR_INCLUDE_PACKAGES := \
     javax/xml/bind \
     javax/xml/soap \
     javax/xml/ws \
+    jdk/internal/instrumentation \
+    jdk/management/resource \
     org/omg \
     sun/applet \
     sun/audio \

test/com/sun/crypto/provider/KeyFactory/TestProviderLeak.java

@@ -66,9 +66,9 @@ public class TestProviderLeak {
                 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();