6986028: assert(_base == Int) failed: Not an Int in CmpINode::sub Reviewed-by: kvn, twisti

6972540: sun/nio/ch/SocketChannelImpl compilation crashed when executing CompileTheWorld Reviewed-by: kvn

6982537: Crash in Node*step_through_mergemem Reviewed-by: kvn

6986270: guarantee(*bcp != Bytecodes::_monitorenter || exec_mode != Deoptimization::Unpack_exception) fails Summary: Propagate the compiler type of the deopting method to vframeArrayElement::unpack_on_stack() Reviewed-by: jrose, never

6984979: OptimizeFill misses some cases with an odd memory graph Reviewed-by: kvn

Added tag hs20-b01 for changeset 75ef8813e3e2

Added tag jdk7-b114 for changeset 21dec68c50e9

Merge

Merge

6983855: The jre combo bundle target needs to be added in the makefile Reviewed-by: billyh, paulk

Merge

6982520: Move kernel to install ws Reviewed-by: herrick, billyh

Merge

Merge

6978977: Productivity: use ant for java part of build Reviewed-by: mduigou, herrick, ohair, ngthomas

Added tag jdk7-b114 for changeset fec780096b1f

Added tag jdk7-b114 for changeset 750c1ccb2f2d

Merge

Merge

Merge

Merge

6907737: (file) FileVisitor and Files.walkFileTree issues Reviewed-by: jjg

6988436: Cleanup javac option handling Reviewed-by: darcy

6983738: Use a JavacTestingAbstractProcessor Reviewed-by: jjg

6502392: Invalid relative names for Filer.createResource and Filer.getResource Reviewed-by: darcy

6967842: Element not returned from tree API for ARM resource variables. Reviewed-by: jjg, darcy

6986246: Trees object is round-specific Reviewed-by: darcy

6877202: Elements.getDocComment() is not getting JavaDocComments 6861094: javac -Xprint <file> does not print comments 6985205: access to tree positions and doc comments may be lost across annotation processing rounds Reviewed-by: darcy

6890226: javah -version is broken Reviewed-by: darcy

Merge

6986772: langtools netbeans build should use ${ant.core.lib} instead of ${ant.home}/lib/ant.jar Reviewed-by: ohair

6587674: NoClassdefFound when anonymously extending a class. Reviewed-by: jjg, mcimadamore

6863465: javac doesn't detect circular subclass dependencies via qualified names Summary: class inheritance circularity check should look at trees, not just symbols Reviewed-by: jjg

5088624: cannot find symbol message should be more intelligent Summary: Resolve.java should keep track of all candidates found during a method resolution sweep to generate more meaningful diagnostics Reviewed-by: jjg

6980862: too aggressive compiler optimization causes stale results of Types.implementation() Summary: use a scope counter in order to determine when/if the implementation cache entries are stale Reviewed-by: jjg

Added tag jdk7-b113 for changeset edcbadb1c4b3

Merge

Added tag jdk7-b113 for changeset 9d2d843d318f

Merge

Added tag jdk7-b113 for changeset 039713686e1c

Merge

Added tag jdk7-b113 for changeset c180f52ae197

Merge

Merge

6990846: Demo: NIO.2 filesystem provider for zip/jar archives Summary: The first drop of the zip filesystem provider, as a separate demo Reviewed-by: alanb

Merge

6989139: Address JDBC Findbugs where Number type Constructor are used Reviewed-by: ohair

6989190: SO_SNDBUF/SO_RCVBUF limits should only be checked when setsockopt fails (sol) Reviewed-by: chegar, michaelm

6907737: (file) FileVisitor and Files.walkFileTree issues Reviewed-by: sherman

Merge

6979526: (file) java/nio/file/FileStore/Basic.java fails if the same file system is mounted more than once Reviewed-by: kevinw, forax

6988993: Address Findbugs warnings for the use of String Constructor Reviewed-by: ohair

Merge

6988037: fileClose prints debug message is close fails Reviewed-by: kevinw, forax

6987461: Handle leak when enabling java.net.useSystemProxies Summary: Release the registry key handle if ProxyEnable is 0 Reviewed-by: michaelm

6988163: sun.security.util.Resources dup and a keytool doc typo Reviewed-by: xuelei