Index: modules/luni/src/test/java/tests/api/java/net/ProxyTest.java =================================================================== --- modules/luni/src/test/java/tests/api/java/net/ProxyTest.java (revision 546383) +++ modules/luni/src/test/java/tests/api/java/net/ProxyTest.java (working copy) @@ -128,6 +128,11 @@ // ensure no NPE is thrown proxy.toString(); + // Regression test for Java 6 spec change + proxy = new Proxy(Proxy.Type.HTTP, address); + assertTrue(proxy.toString().contains("@")); + proxy = new Proxy(Proxy.Type.SOCKS, address); + assertTrue(proxy.toString().contains(address.toString())); } /** Index: modules/luni/src/main/java/java/net/Proxy.java =================================================================== --- modules/luni/src/main/java/java/net/Proxy.java (revision 546383) +++ modules/luni/src/main/java/java/net/Proxy.java (working copy) @@ -107,11 +107,15 @@ */ @Override public String toString() { - String proxyString = String.valueOf(type); - if (null != address) { - proxyString += "/" + address.toString(); //$NON-NLS-1$ + StringBuilder builder = new StringBuilder(); + if (type != null) { + builder.append(type.toString()); } - return proxyString; + builder.append("@"); //$NON-NLS-1$ + if (type != Proxy.Type.DIRECT && address != null) { + builder.append(address.toString()); + } + return builder.toString(); } /**