Index: luni/src/main/java/java/net/InetAddress.java =================================================================== --- luni/src/main/java/java/net/InetAddress.java (revision 486101) +++ luni/src/main/java/java/net/InetAddress.java (working copy) @@ -62,7 +62,7 @@ String hostName; private class WaitReachable {} - private Object waitReachable = new WaitReachable(); + private transient Object waitReachable = new WaitReachable(); private boolean reached; Index: luni/src/main/java/java/net/URLClassLoader.java =================================================================== --- luni/src/main/java/java/net/URLClassLoader.java (revision 486101) +++ luni/src/main/java/java/net/URLClassLoader.java (working copy) @@ -383,7 +383,7 @@ newExtensions[k] = null; } else { result = findInExtensions(explore(newExtensions[k], - i), name, i, resources, url); + i), name, i, null, url); if (result != null) { return result; } @@ -485,7 +485,7 @@ * @return java.net.URL[] */ public URL[] getURLs() { - return orgUrls; + return orgUrls.clone(); } /** Index: luni/src/main/java/java/net/URLConnection.java =================================================================== --- luni/src/main/java/java/net/URLConnection.java (revision 486101) +++ luni/src/main/java/java/net/URLConnection.java (working copy) @@ -229,13 +229,15 @@ if (packageList != null) { final StringTokenizer st = new StringTokenizer(packageList, "|"); while (st.countTokens() > 0) { - try { - Class cl = Class.forName(st.nextToken() + "." + typeString, - true, ClassLoader.getSystemClassLoader()); - cHandler = cl.newInstance(); - } catch (Exception e) { - } - } + try { + Class cl = Class.forName(st.nextToken() + "." + typeString, + true, ClassLoader.getSystemClassLoader()); + cHandler = cl.newInstance(); + } catch (ClassNotFoundException e) { + } catch (IllegalAccessException e) { + } catch (InstantiationException e) { + } + } } if (cHandler == null) { Index: luni/src/main/java/java/net/URL.java =================================================================== --- luni/src/main/java/java/net/URL.java (revision 486101) +++ luni/src/main/java/java/net/URL.java (working copy) @@ -586,26 +586,38 @@ StringTokenizer st = new StringTokenizer(packageList, "|"); //$NON-NLS-1$ while (st.hasMoreTokens()) { String className = st.nextToken() + "." + protocol + ".Handler"; //$NON-NLS-1$ //$NON-NLS-2$ - try { - strmHandler = (URLStreamHandler) Class.forName(className, - true, ClassLoader.getSystemClassLoader()) - .newInstance(); - streamHandlers.put(protocol, strmHandler); + + try { + strmHandler = (URLStreamHandler) Class.forName(className, + true, ClassLoader.getSystemClassLoader()) + .newInstance(); + } catch (IllegalAccessException e) { + } catch (InstantiationException e) { + } catch (ClassNotFoundException e) { + } + if(strmHandler != null) { + streamHandlers.put(protocol, strmHandler); + } return; - } catch (Exception e) { - } + } } // No one else has provided a handler, so try our internal one. - try { + String className = "org.apache.harmony.luni.internal.net.www.protocol." + protocol //$NON-NLS-1$ + ".Handler"; //$NON-NLS-1$ - strmHandler = (URLStreamHandler) Class.forName(className) - .newInstance(); - streamHandlers.put(protocol, strmHandler); - } catch (Exception e) { - } + try { + strmHandler = (URLStreamHandler) Class.forName(className) + .newInstance(); + } catch (IllegalAccessException e) { + } catch (InstantiationException e) { + } catch (ClassNotFoundException e) { + } + if(strmHandler != null) { + streamHandlers.put(protocol, strmHandler); + } + } /** Index: luni/src/main/java/java/io/ObjectInputStream.java =================================================================== --- luni/src/main/java/java/io/ObjectInputStream.java (revision 487166) +++ luni/src/main/java/java/io/ObjectInputStream.java (working copy) @@ -1274,7 +1274,7 @@ Iterator streamIt = streamClassList.iterator(); while (streamIt.hasNext()) { ObjectStreamClass streamClass = streamIt.next(); - readObjectForClass(object, streamClass); + readObjectForClass(null, streamClass); } } else { ArrayList> classList = new ArrayList>(32); @@ -1457,7 +1457,7 @@ throw new InvalidClassException(Msg.getString("K00d1")); //$NON-NLS-1$ } - Integer newHandle = new Integer(nextHandle()); + Integer newHandle = Integer.valueOf(nextHandle()); // Array size int size = input.readInt(); @@ -1565,7 +1565,7 @@ byte tc = nextTC(); switch (tc) { case TC_CLASSDESC: - return readEnumDescInternal(tc); + return readEnumDescInternal(); case TC_REFERENCE: return (ObjectStreamClass) readCyclicReference(); case TC_NULL: @@ -1576,7 +1576,7 @@ } } - private ObjectStreamClass readEnumDescInternal(byte tc) throws IOException, ClassNotFoundException{ + private ObjectStreamClass readEnumDescInternal() throws IOException, ClassNotFoundException{ ObjectStreamClass classDesc; primitiveData = input; Integer oldHandle = descriptorHandle; @@ -1599,7 +1599,7 @@ .getString("K00da", superClass, //$NON-NLS-1$ superClass)); } - tc = nextTC(); + byte tc = nextTC(); // discard TC_ENDBLOCKDATA after classDesc if any if (tc == TC_ENDBLOCKDATA) { // read next parent class. For enum, it may be null @@ -1749,7 +1749,7 @@ // We must register the class descriptor before reading field // descriptors. //if called outside of readObject, the descriptorHandle might be null - descriptorHandle = (null == descriptorHandle? new Integer(nextHandle()):descriptorHandle); + descriptorHandle = (null == descriptorHandle? Integer.valueOf(nextHandle()):descriptorHandle); registerObjectRead(newClassDesc, descriptorHandle, false); descriptorHandle = null; @@ -2376,7 +2376,7 @@ //not primitive class //Use the first non-null ClassLoader on the stack. If null, use the // system class loader - return cls = Class.forName(className, true, callerClassLoader); + return Class.forName(className, true, callerClassLoader); } return cls; } Index: luni/src/main/java/java/io/PipedOutputStream.java =================================================================== --- luni/src/main/java/java/io/PipedOutputStream.java (revision 487166) +++ luni/src/main/java/java/io/PipedOutputStream.java (working copy) @@ -89,12 +89,14 @@ throw new NullPointerException(); } if (this.dest == null) { - if (!stream.isConnected) { - stream.buffer = new byte[PipedInputStream.PIPE_SIZE]; - stream.isConnected = true; - this.dest = stream; - } else { - throw new IOException(Msg.getString("K007a")); //$NON-NLS-1$ + synchronized (stream) { + if (!stream.isConnected) { + stream.buffer = new byte[PipedInputStream.PIPE_SIZE]; + stream.isConnected = true; + this.dest = stream; + } else { + throw new IOException(Msg.getString("K007a")); //$NON-NLS-1$ + } } } else { throw new IOException(Msg.getString("K0079")); //$NON-NLS-1$ Index: luni/src/main/java/java/io/ByteArrayOutputStream.java =================================================================== --- luni/src/main/java/java/io/ByteArrayOutputStream.java (revision 487166) +++ luni/src/main/java/java/io/ByteArrayOutputStream.java (working copy) @@ -249,7 +249,7 @@ * @throws IOException * If an error occurs when writing to output stream */ - public void writeTo(OutputStream out) throws IOException { + public synchronized void writeTo(OutputStream out) throws IOException { out.write(buf, 0, count); } } Index: luni/src/main/java/java/util/ResourceBundle.java =================================================================== --- luni/src/main/java/java/util/ResourceBundle.java (revision 486101) +++ luni/src/main/java/java/util/ResourceBundle.java (working copy) @@ -268,9 +268,11 @@ Class bundleClass = Class.forName(bundleName, true, loader); bundle = (ResourceBundle) bundleClass.newInstance(); bundle.setLocale(locale); - } catch (Exception e) { } catch (LinkageError e) { - } + } catch (ClassNotFoundException e) { + } catch (IllegalAccessException e) { + } catch (InstantiationException e) { + } if (bundle == null) { final String fileName = bundleName.replace('.', '/'); Index: luni/src/main/java/java/util/Observable.java =================================================================== --- luni/src/main/java/java/util/Observable.java (revision 486101) +++ luni/src/main/java/java/util/Observable.java (working copy) @@ -50,7 +50,7 @@ } /** - * Clears the changed flag for this Observable. + * Clears the changed flag for this Observable. After calling clearChanged(), hasChanged() will return false. */ protected synchronized void clearChanged() { changed = false; @@ -93,25 +93,27 @@ } /** - * If the changed flag is set, calls the update() method for + * If hasChanged() returns true, calls the update() method for * every Observer in the list of observers using null as the argument. - * Clears the changed flag. + * Afterwards calls clearChanged(). + * + * Equivalent to calling notifyObservers(null) */ public void notifyObservers() { notifyObservers(null); } /** - * If the changed flag is set, calls the update() method for + * If hasChanged() returns true, calls the update() method for * every Observer in the list of observers using the specified argument. - * Clears the changed flag. + * Afterwards calls clearChanged(). * * @param data * the argument passed to update() */ @SuppressWarnings("unchecked") public void notifyObservers(Object data) { - if (changed) { + if (hasChanged()) { // Must clone the vector in case deleteObserver is called Vector clone = (Vector)observers.clone(); int size = clone.size(); @@ -123,7 +125,7 @@ } /** - * Sets the changed flag for this Observable. + * Sets the changed flag for this Observable. After calling setChanged(), hasChanged() will return true. */ protected synchronized void setChanged() { changed = true; Index: luni/src/main/java/java/util/LinkedList.java =================================================================== --- luni/src/main/java/java/util/LinkedList.java (revision 486101) +++ luni/src/main/java/java/util/LinkedList.java (working copy) @@ -381,9 +381,20 @@ * * @see java.lang.Cloneable */ - @Override + @SuppressWarnings("unchecked") + @Override public Object clone() { - return new LinkedList(this); + try { + LinkedList l = (LinkedList) super.clone(); + l.size = 0; + l.voidLink = new Link(null, null, null); + l.voidLink.previous = l.voidLink; + l.voidLink.next = l.voidLink; + l.addAll(this); + return l; + } catch (CloneNotSupportedException e) { + return null; + } } /** Index: luni/src/main/java/java/util/Vector.java =================================================================== --- luni/src/main/java/java/util/Vector.java (revision 488666) +++ luni/src/main/java/java/util/Vector.java (working copy) @@ -445,7 +445,7 @@ * @see #size */ @Override - public E get(int location) { + public synchronized E get(int location) { return elementAt(location); } Index: luni/src/main/java/java/util/Timer.java =================================================================== --- luni/src/main/java/java/util/Timer.java (revision 486101) +++ luni/src/main/java/java/util/Timer.java (working copy) @@ -295,6 +295,7 @@ tasks.root.deleteIfCancelled(tasks); return tasks.deletedCancelledNumber; } + } /* This object will be used in synchronization purposes */ @@ -304,7 +305,7 @@ @SuppressWarnings("unused") private Object finalizer = new Object() { //$NON-LOCK-1$ @Override - public void finalize() { + protected void finalize() { synchronized (impl) { impl.finished = true; impl.notify(); Index: luni/src/main/java/org/apache/harmony/luni/platform/AdapterManager.java =================================================================== --- luni/src/main/java/org/apache/harmony/luni/platform/AdapterManager.java (revision 486101) +++ luni/src/main/java/org/apache/harmony/luni/platform/AdapterManager.java (working copy) @@ -35,7 +35,7 @@ private final HashMap> factories = new HashMap>(); public Object getAdapter(IAdaptable adaptable, Class adapterType) { - List factoryList = factories.get(adaptable); + List factoryList = factories.get(adapterType); if (factoryList != null) { for (Iterator factoryItr = factoryList.iterator(); factoryItr .hasNext();) { Index: luni/src/main/java/org/apache/harmony/luni/platform/DebugMemorySpy.java =================================================================== --- luni/src/main/java/org/apache/harmony/luni/platform/DebugMemorySpy.java (revision 486101) +++ luni/src/main/java/org/apache/harmony/luni/platform/DebugMemorySpy.java (working copy) @@ -25,7 +25,7 @@ */ final class DebugMemorySpy extends AbstractMemorySpy { - private final boolean stackDump = true; + private static final boolean stackDump = true; public DebugMemorySpy() { super(); Index: luni/src/main/java/org/apache/harmony/luni/net/PlainDatagramSocketImpl.java =================================================================== --- luni/src/main/java/org/apache/harmony/luni/net/PlainDatagramSocketImpl.java (revision 486101) +++ luni/src/main/java/org/apache/harmony/luni/net/PlainDatagramSocketImpl.java (working copy) @@ -156,9 +156,9 @@ @Override public Object getOption(int optID) throws SocketException { if (optID == SocketOptions.SO_TIMEOUT) { - return new Integer(receiveTimeout); + return Integer.valueOf(receiveTimeout); } else if (optID == SocketOptions.IP_TOS) { - return new Integer(trafficClass); + return Integer.valueOf(trafficClass); } else { // Call the native first so there will be // an exception if the socket if closed. @@ -343,7 +343,7 @@ @Override public void setTimeToLive(int ttl) throws java.io.IOException { - setOption(IP_MULTICAST_TTL, new Byte((byte) (ttl & 0xFF))); + setOption(IP_MULTICAST_TTL, Byte.valueOf((byte) (ttl & 0xFF))); if ((netImpl.getSocketFlags() & MULTICAST_TTL) != 0) { this.ttl = ttl; } @@ -351,7 +351,7 @@ @Override public void setTTL(byte ttl) throws java.io.IOException { - setOption(IP_MULTICAST_TTL, new Byte(ttl)); + setOption(IP_MULTICAST_TTL, Byte.valueOf(ttl)); if ((netImpl.getSocketFlags() & MULTICAST_TTL) != 0) { this.ttl = ttl; } Index: luni/src/main/java/org/apache/harmony/luni/net/PlainSocketImpl.java =================================================================== --- luni/src/main/java/org/apache/harmony/luni/net/PlainSocketImpl.java (revision 486101) +++ luni/src/main/java/org/apache/harmony/luni/net/PlainSocketImpl.java (working copy) @@ -254,16 +254,16 @@ @Override public Object getOption(int optID) throws SocketException { if (optID == SocketOptions.SO_TIMEOUT) { - return new Integer(receiveTimeout); + return Integer.valueOf(receiveTimeout); } else if (optID == SocketOptions.IP_TOS) { - return new Integer(trafficClass); + return Integer.valueOf(trafficClass); } else { // Call the native first so there will be // an exception if the socket if closed. Object result = netImpl.getSocketOption(fd, optID); if (optID == SocketOptions.TCP_NODELAY && (netImpl.getSocketFlags() & TCP_NODELAY) != 0) { - return new Boolean(tcpNoDelay); + return Boolean.valueOf(tcpNoDelay); } return result; } Index: luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_en_SG.java =================================================================== --- luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_en_SG.java (revision 486101) +++ luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_en_SG.java (working copy) @@ -21,7 +21,7 @@ public class Locale_en_SG extends java.util.ListResourceBundle { protected Object[][] getContents() { Object[][] contents = { - {"First_Day",new java.lang.Integer(0),}, + {"First_Day",java.lang.Integer.valueOf(0),}, {"Date_SHORT","d/M/yy",}, {"Date_MEDIUM","d/M/yyyy",}, {"Date_LONG","d MMMM, yyyy",}, Index: luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_ar.java =================================================================== --- luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_ar.java (revision 486101) +++ luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_ar.java (working copy) @@ -21,7 +21,7 @@ public class Locale_ar extends java.util.ListResourceBundle { protected Object[][] getContents() { Object[][] contents = { - {"First_Day",new java.lang.Integer(7),}, + {"First_Day",java.lang.Integer.valueOf(7),}, {"LocalPatternChars","GanjkHmsSEDFwWxhKzZ",}, {"ampm",new String[]{"\u0635","\u0645",}, }, Index: luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_nl.java =================================================================== --- luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_nl.java (revision 486101) +++ luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_nl.java (working copy) @@ -21,8 +21,8 @@ public class Locale_nl extends java.util.ListResourceBundle { protected Object[][] getContents() { Object[][] contents = { - {"First_Day",new java.lang.Integer(2),}, - {"Minimal_Days",new java.lang.Integer(4),}, + {"First_Day",java.lang.Integer.valueOf(2),}, + {"Minimal_Days",java.lang.Integer.valueOf(4),}, {"months",new String[]{"januari","februari","maart","april","mei","juni","juli","augustus","september","oktober","november","december","",}, }, {"shortMonths",new String[]{"jan","feb","mrt","apr","mei","jun","jul","aug","sep","okt","nov","dec","",}, Index: luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_nl_BE.java =================================================================== --- luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_nl_BE.java (revision 486101) +++ luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_nl_BE.java (working copy) @@ -21,7 +21,7 @@ public class Locale_nl_BE extends java.util.ListResourceBundle { protected Object[][] getContents() { Object[][] contents = { - {"Minimal_Days",new java.lang.Integer(1),}, + {"Minimal_Days",java.lang.Integer.valueOf(1),}, {"Date_SHORT","d/MM/yy",}, {"Time_FULL","H.mm' u. 'z",}, {"CurrencySymbol","\u20ac",}, Index: luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_de.java =================================================================== --- luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_de.java (revision 486101) +++ luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_de.java (working copy) @@ -21,8 +21,8 @@ public class Locale_de extends java.util.ListResourceBundle { protected Object[][] getContents() { Object[][] contents = { - {"First_Day",new java.lang.Integer(2),}, - {"Minimal_Days",new java.lang.Integer(4),}, + {"First_Day",java.lang.Integer.valueOf(2),}, + {"Minimal_Days",java.lang.Integer.valueOf(4),}, {"eras",new String[]{"v. Chr.","n. Chr.",}, }, {"months",new String[]{"Januar","Februar","M\u00e4rz","April","Mai","Juni","Juli","August","September","Oktober","November","Dezember","",}, Index: luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_sv.java =================================================================== --- luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_sv.java (revision 486101) +++ luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_sv.java (working copy) @@ -21,8 +21,8 @@ public class Locale_sv extends java.util.ListResourceBundle { protected Object[][] getContents() { Object[][] contents = { - {"First_Day",new java.lang.Integer(2),}, - {"Minimal_Days",new java.lang.Integer(4),}, + {"First_Day",java.lang.Integer.valueOf(2),}, + {"Minimal_Days",java.lang.Integer.valueOf(4),}, {"months",new String[]{"januari","februari","mars","april","maj","juni","juli","augusti","september","oktober","november","december","",}, }, {"shortMonths",new String[]{"jan","feb","mar","apr","maj","jun","jul","aug","sep","okt","nov","dec","",}, Index: luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_fi.java =================================================================== --- luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_fi.java (revision 486101) +++ luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_fi.java (working copy) @@ -21,8 +21,8 @@ public class Locale_fi extends java.util.ListResourceBundle { protected Object[][] getContents() { Object[][] contents = { - {"First_Day",new java.lang.Integer(2),}, - {"Minimal_Days",new java.lang.Integer(4),}, + {"First_Day",java.lang.Integer.valueOf(2),}, + {"Minimal_Days",java.lang.Integer.valueOf(4),}, {"LocalPatternChars","GanjkHmsSEDFwWxhKzZ",}, {"months",new String[]{"tammikuu","helmikuu","maaliskuu","huhtikuu","toukokuu","kes\u00e4kuu","hein\u00e4kuu","elokuu","syyskuu","lokakuu","marraskuu","joulukuu","",}, }, Index: luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_cs.java =================================================================== --- luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_cs.java (revision 486101) +++ luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_cs.java (working copy) @@ -21,7 +21,7 @@ public class Locale_cs extends java.util.ListResourceBundle { protected Object[][] getContents() { Object[][] contents = { - {"First_Day",new java.lang.Integer(2),}, + {"First_Day",java.lang.Integer.valueOf(2),}, {"ampm",new String[]{"dop.","odp.",}, }, {"eras",new String[]{"p\u0159.Kr.","po Kr.",}, Index: luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_en_HK.java =================================================================== --- luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_en_HK.java (revision 486101) +++ luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_en_HK.java (working copy) @@ -21,7 +21,7 @@ public class Locale_en_HK extends java.util.ListResourceBundle { protected Object[][] getContents() { Object[][] contents = { - {"First_Day",new java.lang.Integer(2),}, + {"First_Day",java.lang.Integer.valueOf(2),}, {"Date_SHORT","d/MM/yy",}, {"Date_MEDIUM","d/MMM/yyyy",}, {"Date_LONG","d MMMM yyyy",}, Index: luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_et.java =================================================================== --- luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_et.java (revision 486101) +++ luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_et.java (working copy) @@ -21,8 +21,8 @@ public class Locale_et extends java.util.ListResourceBundle { protected Object[][] getContents() { Object[][] contents = { - {"First_Day",new java.lang.Integer(2),}, - {"Minimal_Days",new java.lang.Integer(4),}, + {"First_Day",java.lang.Integer.valueOf(2),}, + {"Minimal_Days",java.lang.Integer.valueOf(4),}, {"LocalPatternChars","GanjkHmsSEDFwWxhKzZ",}, {"eras",new String[]{"e.m.a.","m.a.j.",}, }, Index: luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_en_PH.java =================================================================== --- luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_en_PH.java (revision 486101) +++ luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_en_PH.java (working copy) @@ -21,7 +21,7 @@ public class Locale_en_PH extends java.util.ListResourceBundle { protected Object[][] getContents() { Object[][] contents = { - {"First_Day",new java.lang.Integer(6),}, + {"First_Day",java.lang.Integer.valueOf(6),}, {"Date_SHORT","d/MM/yy",}, {"Date_MEDIUM","d-MMM-yy",}, {"Date_LONG","d MMMM yyyy",}, Index: luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_de_AT.java =================================================================== --- luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_de_AT.java (revision 486101) +++ luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_de_AT.java (working copy) @@ -21,7 +21,7 @@ public class Locale_de_AT extends java.util.ListResourceBundle { protected Object[][] getContents() { Object[][] contents = { - {"Minimal_Days",new java.lang.Integer(1),}, + {"Minimal_Days",java.lang.Integer.valueOf(1),}, {"LocalPatternChars","GuMtkHmsSEDFwWahKzZ",}, {"months",new String[]{"J\u00e4nner","Februar","M\u00e4rz","April","Mai","Juni","Juli","August","September","Oktober","November","Dezember","",}, }, Index: luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_pt.java =================================================================== --- luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_pt.java (revision 486101) +++ luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_pt.java (working copy) @@ -21,7 +21,7 @@ public class Locale_pt extends java.util.ListResourceBundle { protected Object[][] getContents() { Object[][] contents = { - {"First_Day",new java.lang.Integer(2),}, + {"First_Day",java.lang.Integer.valueOf(2),}, {"months",new String[]{"janeiro","fevereiro","mar\u00e7o","abril","maio","junho","julho","agosto","setembro","outubro","novembro","dezembro","",}, }, {"shortMonths",new String[]{"jan","fev","mar","abr","mai","jun","jul","ago","set","out","nov","dez","",}, Index: luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_ru.java =================================================================== --- luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_ru.java (revision 486101) +++ luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_ru.java (working copy) @@ -21,7 +21,7 @@ public class Locale_ru extends java.util.ListResourceBundle { protected Object[][] getContents() { Object[][] contents = { - {"First_Day",new java.lang.Integer(2),}, + {"First_Day",java.lang.Integer.valueOf(2),}, {"eras",new String[]{"\u0434\u043e \u043d.\u044d.","\u043d.\u044d.",}, }, {"months",new String[]{"\u044f\u043d\u0432\u0430\u0440\u044f","\u0444\u0435\u0432\u0440\u0430\u043b\u044f","\u043c\u0430\u0440\u0442\u0430","\u0430\u043f\u0440\u0435\u043b\u044f","\u043c\u0430\u044f","\u0438\u044e\u043d\u044f","\u0438\u044e\u043b\u044f","\u0430\u0432\u0433\u0443\u0441\u0442\u0430","\u0441\u0435\u043d\u0442\u044f\u0431\u0440\u044f","\u043e\u043a\u0442\u044f\u0431\u0440\u044f","\u043d\u043e\u044f\u0431\u0440\u044f","\u0434\u0435\u043a\u0430\u0431\u0440\u044f","",}, Index: luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_kk.java =================================================================== --- luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_kk.java (revision 486101) +++ luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_kk.java (working copy) @@ -21,7 +21,7 @@ public class Locale_kk extends java.util.ListResourceBundle { protected Object[][] getContents() { Object[][] contents = { - {"First_Day",new java.lang.Integer(2),}, + {"First_Day",java.lang.Integer.valueOf(2),}, {"months",new String[]{"\u049b\u0430\u04a3\u0442\u0430\u0440","\u0430\u049b\u043f\u0430\u043d","\u043d\u0430\u0443\u0440\u044b\u0437","\u0441\u04d9\u0443\u0456\u0440","\u043c\u0430\u043c\u044b\u0440","\u043c\u0430\u0443\u0441\u044b\u043c","\u0448\u0456\u043b\u0434\u0435","\u0442\u0430\u043c\u044b\u0437","\u049b\u044b\u0440\u043a\u04af\u0439\u0435\u043a","\u049b\u0430\u0437\u0430\u043d","\u049b\u0430\u0440\u0430\u0448\u0430","\u0436\u0435\u043b\u0442\u043e\u049b\u0441\u0430\u043d","",}, }, {"shortMonths",new String[]{"\u049a\u0430\u04a3","\u0410\u049b\u043f","\u041d\u0430\u0443","\u0421\u04d9\u0443","\u041c\u0430\u043c","\u041c\u0430\u0443","\u0428\u0456\u043b","\u0422\u0430\u043c","\u049a\u044b\u0440","\u049a\u0430\u0437","\u049a\u0430\u0440","\u0416\u0435\u043b","",}, Index: luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_en_IE.java =================================================================== --- luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_en_IE.java (revision 486101) +++ luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_en_IE.java (working copy) @@ -21,7 +21,7 @@ public class Locale_en_IE extends java.util.ListResourceBundle { protected Object[][] getContents() { Object[][] contents = { - {"First_Day",new java.lang.Integer(2),}, + {"First_Day",java.lang.Integer.valueOf(2),}, {"timezones",new String[][]{new String[]{"Europe/London","Greenwich Mean Time","GMT","Ireland Summer Time","IST",}, new String[]{"PST","Pacific Standard Time","PST","Pacific Daylight Time","PDT",}, new String[]{"America/Los_Angeles","Pacific Standard Time","PST","Pacific Daylight Time","PDT",}, Index: luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_el.java =================================================================== --- luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_el.java (revision 486101) +++ luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_el.java (working copy) @@ -21,7 +21,7 @@ public class Locale_el extends java.util.ListResourceBundle { protected Object[][] getContents() { Object[][] contents = { - {"First_Day",new java.lang.Integer(2),}, + {"First_Day",java.lang.Integer.valueOf(2),}, {"LocalPatternChars","GanjkHmsSEDFwWxhKzZ",}, {"ampm",new String[]{"\u03c0\u03bc","\u03bc\u03bc",}, }, Index: luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_fr_CA.java =================================================================== --- luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_fr_CA.java (revision 486101) +++ luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_fr_CA.java (working copy) @@ -21,8 +21,8 @@ public class Locale_fr_CA extends java.util.ListResourceBundle { protected Object[][] getContents() { Object[][] contents = { - {"First_Day",new java.lang.Integer(1),}, - {"Minimal_Days",new java.lang.Integer(1),}, //$NON-NLS-1$ + {"First_Day",java.lang.Integer.valueOf(1),}, + {"Minimal_Days",java.lang.Integer.valueOf(1),}, //$NON-NLS-1$ {"LocalPatternChars","GanjkHmsSEDFwWxhKzZ",}, {"Date_SHORT","yy-MM-dd",}, {"Date_MEDIUM","yyyy-MM-dd",}, Index: luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_it.java =================================================================== --- luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_it.java (revision 486101) +++ luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_it.java (working copy) @@ -21,8 +21,8 @@ public class Locale_it extends java.util.ListResourceBundle { protected Object[][] getContents() { Object[][] contents = { - {"First_Day",new java.lang.Integer(2),}, - {"Minimal_Days",new java.lang.Integer(4),}, + {"First_Day",java.lang.Integer.valueOf(2),}, + {"Minimal_Days",java.lang.Integer.valueOf(4),}, {"eras",new String[]{"BC","dopo Cristo",}, }, {"months",new String[]{"gennaio","febbraio","marzo","aprile","maggio","giugno","luglio","agosto","settembre","ottobre","novembre","dicembre","",}, Index: luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_in.java =================================================================== --- luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_in.java (revision 486101) +++ luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_in.java (working copy) @@ -21,7 +21,7 @@ public class Locale_in extends java.util.ListResourceBundle { protected Object[][] getContents() { Object[][] contents = { - {"First_Day",new java.lang.Integer(2),}, + {"First_Day",java.lang.Integer.valueOf(2),}, {"months",new String[]{"Januari","Februari","Maret","April","Mei","Juni","Juli","Agustus","September","Oktober","Nopember","Desember","",}, }, {"shortMonths",new String[]{"Jan","Feb","Mar","Apr","Mei","Jun","Jul","Agu","Sep","Okt","Nop","Des","",}, Index: luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_pl.java =================================================================== --- luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_pl.java (revision 486101) +++ luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_pl.java (working copy) @@ -21,7 +21,7 @@ public class Locale_pl extends java.util.ListResourceBundle { protected Object[][] getContents() { Object[][] contents = { - {"First_Day",new java.lang.Integer(2),}, + {"First_Day",java.lang.Integer.valueOf(2),}, {"eras",new String[]{"p.n.e.","n.e.",}, }, {"months",new String[]{"stycze\u0144","luty","marzec","kwiecie\u0144","maj","czerwiec","lipiec","sierpie\u0144","wrzesie\u0144","pa\u017adziernik","listopad","grudzie\u0144","",}, Index: luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_da.java =================================================================== --- luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_da.java (revision 486101) +++ luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_da.java (working copy) @@ -21,8 +21,8 @@ public class Locale_da extends java.util.ListResourceBundle { protected Object[][] getContents() { Object[][] contents = { - {"First_Day",new java.lang.Integer(2),}, - {"Minimal_Days",new java.lang.Integer(4),}, + {"First_Day",java.lang.Integer.valueOf(2),}, + {"Minimal_Days",java.lang.Integer.valueOf(4),}, {"LocalPatternChars","GuMtkHmsSEDFwWahKzZ",}, {"months",new String[]{"januar","februar","marts","april","maj","juni","juli","august","september","oktober","november","december","",}, }, Index: luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_es.java =================================================================== --- luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_es.java (revision 486101) +++ luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_es.java (working copy) @@ -21,7 +21,7 @@ public class Locale_es extends java.util.ListResourceBundle { protected Object[][] getContents() { Object[][] contents = { - {"First_Day",new java.lang.Integer(2),}, + {"First_Day",java.lang.Integer.valueOf(2),}, {"months",new String[]{"enero","febrero","marzo","abril","mayo","junio","julio","agosto","septiembre","octubre","noviembre","diciembre","",}, }, {"shortMonths",new String[]{"ene","feb","mar","abr","may","jun","jul","ago","sep","oct","nov","dic","",}, Index: luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_ms.java =================================================================== --- luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_ms.java (revision 486101) +++ luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_ms.java (working copy) @@ -21,7 +21,7 @@ public class Locale_ms extends java.util.ListResourceBundle { protected Object[][] getContents() { Object[][] contents = { - {"First_Day",new java.lang.Integer(2),}, + {"First_Day",java.lang.Integer.valueOf(2),}, {"months",new String[]{"Januari","Februari","Mac","April","Mei","Jun","Julai","Ogos","September","Oktober","November","Disember","",}, }, {"shortMonths",new String[]{"Jan","Feb","Mac","Apr","Mei","Jun","Jul","Ogo","Sep","Okt","Nov","Dis","",}, Index: luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale.java =================================================================== --- luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale.java (revision 486101) +++ luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale.java (working copy) @@ -21,8 +21,8 @@ public class Locale extends java.util.ListResourceBundle { protected Object[][] getContents() { Object[][] contents = { - {"First_Day",new java.lang.Integer(1),}, - {"Minimal_Days",new java.lang.Integer(1),}, + {"First_Day",java.lang.Integer.valueOf(1),}, + {"Minimal_Days",java.lang.Integer.valueOf(1),}, {"LocalPatternChars","GyMdkHmsSEDFwWahKzZ",}, {"ampm",new String[]{"AM","PM",}, }, Index: luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_fr_CH.java =================================================================== --- luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_fr_CH.java (revision 486101) +++ luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_fr_CH.java (working copy) @@ -21,7 +21,7 @@ public class Locale_fr_CH extends java.util.ListResourceBundle { protected Object[][] getContents() { Object[][] contents = { - {"Minimal_Days",new java.lang.Integer(4),}, + {"Minimal_Days",java.lang.Integer.valueOf(4),}, {"LocalPatternChars","GanjkHmsSEDFwWxhKzZ",}, {"Date_SHORT","dd.MM.yy",}, {"Date_LONG","d. MMMM yyyy",}, Index: luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_fr.java =================================================================== --- luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_fr.java (revision 486101) +++ luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_fr.java (working copy) @@ -21,8 +21,8 @@ public class Locale_fr extends java.util.ListResourceBundle { protected Object[][] getContents() { Object[][] contents = { - {"First_Day",new java.lang.Integer(2),}, - {"Minimal_Days",new java.lang.Integer(4),}, //$NON-NLS-1$ + {"First_Day",java.lang.Integer.valueOf(2),}, + {"Minimal_Days",java.lang.Integer.valueOf(4),}, //$NON-NLS-1$ {"eras",new String[]{"BC","ap. J.-C.",}, }, {"months",new String[]{"janvier","f\u00e9vrier","mars","avril","mai","juin","juillet","ao\u00fbt","septembre","octobre","novembre","d\u00e9cembre","",}, Index: luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_en_GB.java =================================================================== --- luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_en_GB.java (revision 486101) +++ luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_en_GB.java (working copy) @@ -21,8 +21,8 @@ public class Locale_en_GB extends java.util.ListResourceBundle { protected Object[][] getContents() { Object[][] contents = { - {"First_Day",new java.lang.Integer(2),}, - {"Minimal_Days",new java.lang.Integer(4),}, //$NON-NLS-1$ + {"First_Day",java.lang.Integer.valueOf(2),}, + {"Minimal_Days",java.lang.Integer.valueOf(4),}, //$NON-NLS-1$ {"timezones",new String[][]{new String[]{"Europe/London","Greenwich Mean Time","GMT","British Summer Time","BST",}, new String[]{"PST","Pacific Standard Time","PST","Pacific Daylight Time","PDT",}, new String[]{"America/Los_Angeles","Pacific Standard Time","PST","Pacific Daylight Time","PDT",}, Index: luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_no.java =================================================================== --- luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_no.java (revision 486101) +++ luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_no.java (working copy) @@ -21,8 +21,8 @@ public class Locale_no extends java.util.ListResourceBundle { protected Object[][] getContents() { Object[][] contents = { - {"First_Day",new java.lang.Integer(2),}, - {"Minimal_Days",new java.lang.Integer(4),}, + {"First_Day",java.lang.Integer.valueOf(2),}, + {"Minimal_Days",java.lang.Integer.valueOf(4),}, {"months",new String[]{"januar","februar","mars","april","mai","juni","juli","august","september","oktober","november","desember","",}, }, {"shortMonths",new String[]{"jan","feb","mar","apr","mai","jun","jul","aug","sep","okt","nov","des","",}, Index: luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/file/FileURLConnection.java =================================================================== --- luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/file/FileURLConnection.java (revision 486101) +++ luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/file/FileURLConnection.java (working copy) @@ -195,7 +195,7 @@ if (File.separatorChar != '/') { path = path.replace('/', File.separatorChar); } - permission = new FilePermission(path, new String("read")); + permission = new FilePermission(path, "read"); } return permission; } Index: luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/HttpURLConnection.java =================================================================== --- luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/HttpURLConnection.java (revision 486101) +++ luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/HttpURLConnection.java (working copy) @@ -1056,7 +1056,7 @@ if (response == null || !response.startsWith("HTTP/")) { return -1; } - response.trim(); + response = response.trim(); int mark = response.indexOf(" ") + 1; if (mark == 0) { return -1; Index: luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/ftp/FtpURLConnection.java =================================================================== --- luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/ftp/FtpURLConnection.java (revision 486101) +++ luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/ftp/FtpURLConnection.java (working copy) @@ -321,7 +321,7 @@ * Creates a output stream for writing to this URL Connection. * * @return The output stream to write to - * @throws when the OutputStream could not be created + * @throws IOException when the OutputStream could not be created * * @see #getContent() * @see #getInputStream() Index: luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/jar/JarURLConnection.java =================================================================== --- luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/jar/JarURLConnection.java (revision 486101) +++ luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/jar/JarURLConnection.java (working copy) @@ -24,6 +24,7 @@ import java.io.FilterInputStream; import java.io.IOException; import java.io.InputStream; +import java.io.Serializable; import java.lang.ref.ReferenceQueue; import java.lang.ref.WeakReference; import java.net.URL; @@ -96,11 +97,15 @@ * @see java.lang.Object#equals(java.lang.Object) */ public boolean equals(Object obj) { - return jar == ((LRUKey) obj).jar; + return obj instanceof LRUKey && jar == ((LRUKey) obj).jar; } + + public int hashCode() { + return jar.hashCode(); + } } - static final class LRUComparitor implements Comparator { + static final class LRUComparitor implements Comparator, Serializable { LRUComparitor() { } Index: luni/src/main/java/org/apache/harmony/luni/util/PasswordProtectedInputStream.java =================================================================== --- luni/src/main/java/org/apache/harmony/luni/util/PasswordProtectedInputStream.java (revision 487166) +++ luni/src/main/java/org/apache/harmony/luni/util/PasswordProtectedInputStream.java (working copy) @@ -40,7 +40,7 @@ */ public PasswordProtectedInputStream(InputStream in, byte[] password) { super(in); - this.password = password; + this.password = password.clone(); } @Override Index: luni/src/main/java/org/apache/harmony/luni/util/TwoKeyHashMap.java =================================================================== --- luni/src/main/java/org/apache/harmony/luni/util/TwoKeyHashMap.java (revision 487166) +++ luni/src/main/java/org/apache/harmony/luni/util/TwoKeyHashMap.java (working copy) @@ -42,7 +42,7 @@ private Collection values; private int size; private int arrSize; - private transient int modCount; + private int modCount; private Entry[] arr; @@ -136,7 +136,7 @@ if (key1 == null && key2 == null) { int index = arrSize; if (arr[index] == null) { - arr[index] = createEntry(0, key1, key2, value, null); + arr[index] = createEntry(0, null, null, value, null); size++; modCount++; return null;