Mercurial > hg > openjdk > lambda > jdk
changeset 9531:c1f129f62f36
8022454: Fixed various serializations and deprecation warnings in java.util, java.net and sun.tools
Reviewed-by: darcy
Contributed-by: marcus.lagergren@oracle.com
author | lagergren |
---|---|
date | Wed, 07 Aug 2013 08:08:57 -0700 |
parents | 8c7cf4926157 |
children | d1c82d5bee3f |
files | src/share/classes/java/net/SocketAddress.java src/share/classes/java/util/logging/XMLFormatter.java src/share/classes/sun/tools/jar/JarException.java |
diffstat | 3 files changed, 20 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/java/net/SocketAddress.java Wed Aug 07 06:42:06 2013 -0700 +++ b/src/share/classes/java/net/SocketAddress.java Wed Aug 07 08:08:57 2013 -0700 @@ -39,4 +39,7 @@ * @since 1.4 */ public abstract class SocketAddress implements java.io.Serializable { + + static final long serialVersionUID = 5215720748342549866L; + }
--- a/src/share/classes/java/util/logging/XMLFormatter.java Wed Aug 07 06:42:06 2013 -0700 +++ b/src/share/classes/java/util/logging/XMLFormatter.java Wed Aug 07 08:08:57 2013 -0700 @@ -47,7 +47,7 @@ private LogManager manager = LogManager.getLogManager(); // Append a two digit number. - private void a2(StringBuffer sb, int x) { + private void a2(StringBuilder sb, int x) { if (x < 10) { sb.append('0'); } @@ -55,25 +55,26 @@ } // Append the time and date in ISO 8601 format - private void appendISO8601(StringBuffer sb, long millis) { - Date date = new Date(millis); - sb.append(date.getYear() + 1900); + private void appendISO8601(StringBuilder sb, long millis) { + GregorianCalendar cal = new GregorianCalendar(); + cal.setTimeInMillis(millis); + sb.append(cal.get(Calendar.YEAR) + 1900); sb.append('-'); - a2(sb, date.getMonth() + 1); + a2(sb, cal.get(Calendar.MONTH) + 1); sb.append('-'); - a2(sb, date.getDate()); + a2(sb, cal.get(Calendar.DAY_OF_MONTH)); sb.append('T'); - a2(sb, date.getHours()); + a2(sb, cal.get(Calendar.HOUR_OF_DAY)); sb.append(':'); - a2(sb, date.getMinutes()); + a2(sb, cal.get(Calendar.MINUTE)); sb.append(':'); - a2(sb, date.getSeconds()); + a2(sb, cal.get(Calendar.SECOND)); } - // Append to the given StringBuffer an escaped version of the + // Append to the given StringBuilder an escaped version of the // given text string where XML special characters have been escaped. // For a null string we append "<null>" - private void escape(StringBuffer sb, String text) { + private void escape(StringBuilder sb, String text) { if (text == null) { text = "<null>"; } @@ -102,7 +103,7 @@ * @return a formatted log record */ public String format(LogRecord record) { - StringBuffer sb = new StringBuffer(500); + StringBuilder sb = new StringBuilder(500); sb.append("<record>\n"); sb.append(" <date>"); @@ -224,7 +225,7 @@ * @return a valid XML string */ public String getHead(Handler h) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); String encoding; sb.append("<?xml version=\"1.0\"");
--- a/src/share/classes/sun/tools/jar/JarException.java Wed Aug 07 06:42:06 2013 -0700 +++ b/src/share/classes/sun/tools/jar/JarException.java Wed Aug 07 08:08:57 2013 -0700 @@ -29,6 +29,9 @@ public class JarException extends IOException { + + static final long serialVersionUID = -4351820108009811497L; + public JarException() { super(); }