Merge

6950375: Remove msvcrt.dll from the Windows JRE bundles Reviewed-by: prr

Merge

7008047: remove sanity check of msival tool from JDK tree Reviewed-by: billyh

Merge

Merge

6989472: Provide simple jdk identification information in the install image Reviewed-by: alanb

Merge

7011382: Fix use of VS100COMNTOOLS when installed in non-default or non-space path Reviewed-by: prr

Merge

6980024: Rebranding jre7/jdk7 License, Copyright, Readme 6912291: Third party license agreement should be present in all bundles Reviewed-by: katleman

6975326: Problem in install/make/rebase/Makefile, grep on empty pattern 6413588: Add 'ldd -r' and 'dump -Lv' checks to all .so files delivered in the JDK 7000995: Add check in makefiles to verify that msvcp100.dll is NOT used Reviewed-by: mduigou

Merge

Merge

7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs 7009092: (zipfs) ZipPath.isSameFile() should always return true if this Path and the given Path are equal. 7009085: (zipfs) ZipPath.normalize("/./.") returns null. 7009102: (zipfs) ZipPath.toRealPath() should always return absolute path. Summary: zip filesystem provider update Reviewed-by: alanb

Merge

Merge

7013682: two test checking cpuTime filed java/lang/management/ThreadMXBean Summary: Typo in 6173675 fix dropped getThreadCpuTime(long) result on the floor. Reviewed-by: mchung, dholmes

6173675: M&M: approximate memory allocation rate/amount per thread Summary: Subclass com.sun.management.ThreadMXBean from java.lang.management.ThreadMXBean, add getAllocatedBytes() and friends to c.s.m.ThreadMXBean and have sun.management.ThreadImpl implement c.s.m.ThreadMXBean rather than j.l.m.ThreadMXBean. Reviewed-by: mchung, alanb, dholmes, emcmanus

Merge

6983248: net/net001 and net/net003 fail on WinXP with JDK7-B108 Summary: Using closesocket to close socket handler to avoid invalid C runtime parameter exception. Reviewed-by: alanb, phh, dcubed, dsamersoff, coleenp, acorn

Merge

6912013: Remove the temporary launcher fix to add modules in the bootclasspath Reviewed-by: ksrini

Merge

7012768: InetAddress lookupTable leaks/deadlocks when using unsupported name service spi Reviewed-by: alanb, michaelm

7013739: jdk_rmi target is missing in the top repo's test/Makefile Reviewed-by: ohair, igor

7011857: java/util/concurrent/Phaser/FickleRegister.java fails on solaris-sparc Summary: Remove from ProblemList, failure resolved by 7009231 Reviewed-by: alanb

Merge

6508943: small typo in the documentation 6759414: javascript engine can not write to StringWriter 6869617: RhinoScriptEngine bug : ScriptException cause not set (with fix) 7012701: Add a test to check that Rhino's RegExp parser accepts unescaped '[' Reviewed-by: alanb, jjh

7012003: diamond conversion for ssl Reviewed-by: wetmore

7010903: impl. of http.maxConnections is different from the description in JavaSE document Reviewed-by: alanb, michaelm

7012279: Project Coin: Clarify AutoCloseable and Throwable javadoc Reviewed-by: jjb

6728865: Provide a better heuristics for Collections.disjoint method Reviewed-by: alanb, dholmes, chegar, forax

7003398: NetworkInterface equals() and hashCode() behaviors depend on permissions granted Reviewed-by: chegar, alanb

Merge

Merge

6829919: URLClassLoader.close() doesn't close resource file if getResourceAsStream(...) was called before Reviewed-by: chegar

6964547: Impossible to set useV4 in SocksSocketImpl Summary: Add socksProxyVersion property Reviewed-by: alanb, michaelm

Merge

6896088: URLClassLoader.close() apparently not working for JAR URLs on Windows Reviewed-by: chegar

Merge

6436034: Instance filter doesn't filter event if it occurs in native method Summary: Use 'GetLocalInstance' JVMTI extension if it exists Reviewed-by: coleenp, dcubed

7008713: diamond conversion of kerberos5 and security tools Reviewed-by: weijun

7005424: Resync java.util.concurrent classes with Dougs CVS - Jan 2011 Reviewed-by: dholmes, chegar, mduigou

7011095: revert diamond changes from 6880112 that occur in method args Reviewed-by: darcy, alanb

7000693: java.sql.Timestamp compareTo() issues using low values Reviewed-by: okutsu

7005608: diamond conversion of JCA and crypto providers Reviewed-by: wetmore

6544224: Remove the need of sun.reflect.misc Reviewed-by: alanb

7002957: (fc) FileChannel.transferTo fails to load libsendfile on Solaris 64-bit Reviewed-by: chegar

7008728: diamond conversion of basic security, permissions, authentication Reviewed-by: mullan

7009760: Possible stack corruption in Java_java_net_TwoStacksPlainSocketImpl_socketGetOption Summary: SOCKET_ADDRESS -> SOCKETADDRESS Reviewed-by: alanb

Merge

6993732: Remove the HPI Reviewed-by: ohair, lancea, chegar, mduigou, mchung, mr

7000511: PrintStream, PrintWriter, Formatter, Scanner leave files open when exception thrown Reviewed-by: alanb, mduigou

Merge

6735293: javax.swing.text.NavigationFilter.getNextVisualPositionFrom() not always throws BadLocationException Reviewed-by: peterz

Merge

6246816: SwingSet2 should be rewritten Reviewed-by: peterz

6342301: Bad interaction between setting the ui and file filters in JFileChooser Reviewed-by: alexp

6990651: Regression: NPE when refreshing applet since 6u22-b01 Reviewed-by: peterz