hg: jdk7u/jdk7u-dev/jdk: 5 new changesets

[sean.coffey at oracle.com]

Changeset: f40d035e338d
Author:    coffeys
Date:      2014-08-22 16:10 +0100
URL:       http://hg.openjdk.java.net/jdk7u/jdk7u-dev/jdk/rev/f40d035e338d

8032808: Support Solaris SO_FLOW_SLA socket option
Reviewed-by: michaelm

! make/Makefile
! make/common/shared/Defs-javadoc.gmk
! make/docs/Makefile
! make/docs/NON_CORE_PKGS.gmk
! make/java/net/FILES_c.gmk
! make/java/net/mapfile-vers
+ make/jdk/Makefile
+ make/jdk/net/FILES_java.gmk
+ make/jdk/net/Makefile
! make/sun/net/FILES_java.gmk
! src/share/classes/java/net/DatagramSocket.java
! src/share/classes/java/net/DatagramSocketImpl.java
! src/share/classes/java/net/SocketImpl.java
+ src/share/classes/java/net/SocketSecrets.java
+ src/share/classes/jdk/net/ExtendedSocketOptions.java
+ src/share/classes/jdk/net/NetworkPermission.java
+ src/share/classes/jdk/net/SocketFlow.java
+ src/share/classes/jdk/net/Sockets.java
+ src/share/classes/jdk/net/package-info.java
+ src/share/classes/sun/net/ExtendedOptionsImpl.java
! src/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java
! src/share/classes/sun/nio/ch/DatagramChannelImpl.java
! src/share/classes/sun/nio/ch/Net.java
! src/share/classes/sun/nio/ch/SocketChannelImpl.java
+ src/share/native/java/net/jdk_net_SocketFlow.h
! src/share/native/java/net/net_util.h
! src/solaris/classes/java/net/PlainDatagramSocketImpl.java
! src/solaris/classes/java/net/PlainSocketImpl.java
+ src/solaris/native/java/net/ExtendedOptionsImpl.c
! src/solaris/native/java/net/net_util_md.h
+ src/windows/native/java/net/ExtendedOptionsImpl.c
! test/Makefile
+ test/jdk/net/Sockets/Test.java
+ test/jdk/net/Sockets/policy.fail
+ test/jdk/net/Sockets/policy.success

Changeset: e036c254ef30
Author:    michaelm
Date:      2014-06-24 11:32 +0100
URL:       http://hg.openjdk.java.net/jdk7u/jdk7u-dev/jdk/rev/e036c254ef30

8047186: jdk.net.Sockets throws InvocationTargetException instead of original runtime exceptions
Reviewed-by: michaelm
Contributed-by: artem.smotrakov at oracle.com

! src/share/classes/jdk/net/Sockets.java

Changeset: 75dceeafa4c8
Author:    michaelm
Date:      2014-08-15 14:50 +0100
URL:       http://hg.openjdk.java.net/jdk7u/jdk7u-dev/jdk/rev/75dceeafa4c8

8029607: Type of Service (TOS) cannot be set in IPv6 header
Reviewed-by: alanb

! src/share/classes/sun/nio/ch/DatagramChannelImpl.java
! src/share/classes/sun/nio/ch/Net.java
! src/share/classes/sun/nio/ch/ServerSocketChannelImpl.java
! src/share/classes/sun/nio/ch/SocketChannelImpl.java
! src/share/native/sun/nio/ch/genSocketOptionRegistry.c
! src/solaris/native/java/net/net_util_md.c
! src/solaris/native/sun/nio/ch/Net.c
! src/windows/native/sun/nio/ch/Net.c

Changeset: 8d0a1cb7b3b9
Author:    michaelm
Date:      2014-07-07 12:42 +0100
URL:       http://hg.openjdk.java.net/jdk7u/jdk7u-dev/jdk/rev/8d0a1cb7b3b9

8048212: Two tests failed with "java.net.SocketException: Bad protocol option" on Windows after 8029607
Reviewed-by: alanb

! src/windows/native/java/net/net_util_md.c
! src/windows/native/sun/nio/ch/Net.c

Changeset: 6c199d604eef
Author:    coffeys
Date:      2014-08-28 14:18 +0100
URL:       http://hg.openjdk.java.net/jdk7u/jdk7u-dev/jdk/rev/6c199d604eef

Merge