Optimizations to create instances in Number classes and Character (original) (raw)

Otávio Gonçalves de Santana otaviojava at java.net
Fri Jun 20 13:12:14 UTC 2014


The Number classes (Integer, Short, Byte, Long) and Character have cache and it is used when is called the valueOf method, this way it creates new instances when is necessary. Using the valueOf, when the value is in the cache, beyond save memory will faster than always create new instances.

[1] WebDrev: https://dl.dropboxusercontent.com/u/16109193/open_jdk/number_character.zip

Benchmark (size) Mode Samples Mean Mean error Units m.InstancesBenchmark.newInstanceByte 1000000 thrpt 10 295.250 3.964 ops/s m.InstancesBenchmark.newInstanceChar 1000000 thrpt 10 290.962 6.096 ops/s m.InstancesBenchmark.newInstanceInteger 1000000 thrpt 10 280.035 5.997 ops/s m.InstancesBenchmark.newInstanceLong 1000000 thrpt 10 195.535 5.326 ops/s m.InstancesBenchmark.newInstanceShort 1000000 thrpt 10 289.213 6.920 ops/s m.InstancesBenchmark.valueOfByte 1000000 thrpt 10 457.773 0.788 ops/s m.InstancesBenchmark.valueOfChar 1000000 thrpt 10 343.380 1.364 ops/s m.InstancesBenchmark.valueOfInteger 1000000 thrpt 10 332.707 1.771 ops/s m.InstancesBenchmark.valueOfLong 1000000 thrpt 10 336.833 3.318 ops/s m.InstancesBenchmark.valueOfShort 1000000 thrpt 10 333.420 0.651 ops/s

[1]

import java.util.ArrayList; import java.util.List; import java.util.Random; import java.util.concurrent.TimeUnit; import org.openjdk.jmh.annotations.GenerateMicroBenchmark; import org.openjdk.jmh.annotations.OutputTimeUnit; import org.openjdk.jmh.annotations.Scope; import org.openjdk.jmh.annotations.State; import org.openjdk.jmh.annotations.Param; import org.openjdk.jmh.annotations.Setup; import org.openjdk.jmh.logic.BlackHole;

@State(Scope.Thread) @OutputTimeUnit(TimeUnit.SECONDS) public class InstancesBenchmark {

@Param("1000000")
private int size;

private Random random;

private short[] shorts;
private byte[] bytes;
private int[] interges;
private long[] longs;
private char[] chars;

@Setup
public void s() {
    random = new Random();
    shorts = new short[size];
    bytes = new byte[size];
    interges = new int[size];
    longs = new long[size];
    chars = new char[size];
    for (int i = 0; i < size; i++) {
        int value = random.nextInt();
        longs[i] = (long) value;
        interges[i] = value;
        shorts[i] = (short) value;
        bytes[i] = (byte) value;
        chars[i] = (char) value;
    }

}

@GenerateMicroBenchmark
public void valueOfInteger(BlackHole bh) {
    for (int value : interges) {
        Integer number = value;
        bh.consume(number);
    }
}

@GenerateMicroBenchmark
public void newInstanceInteger(BlackHole bh) {
    for (int value : interges) {
        Integer number = new Integer(value);
        bh.consume(number);
    }
}

@GenerateMicroBenchmark
public void valueOfLong(BlackHole bh) {
    for (long value : longs) {
        Long number = value;
        bh.consume(number);
    }
}

@GenerateMicroBenchmark
public void newInstanceLong(BlackHole bh) {
    for (long value : longs) {
        Long number = new Long(value);
        bh.consume(number);
    }
}

@GenerateMicroBenchmark
public void valueOfByte(BlackHole bh) {
    for (byte value : bytes) {
        Byte number = value;
        bh.consume(number);
    }
}

@GenerateMicroBenchmark
public void newInstanceByte(BlackHole bh) {
    for (byte value : bytes) {
        Byte number = new Byte(value);
        bh.consume(number);
    }
}

@GenerateMicroBenchmark
public void valueOfShort(BlackHole bh) {
    for (short value : shorts) {
        Short number = value;
        bh.consume(number);
    }
}

@GenerateMicroBenchmark
public void newInstanceShort(BlackHole bh) {
    for (short value : shorts) {
        Short number = new Short(value);
        bh.consume(number);
    }
}

@GenerateMicroBenchmark
public void valueOfChar(BlackHole bh) {
    for (char value : chars) {
        Character number = value;
        bh.consume(number);
    }
}

@GenerateMicroBenchmark
public void newInstanceChar(BlackHole bh) {
    for (char value : chars) {
        Character number = new Character(value);
        bh.consume(number);
    }
}

}

-- Atenciosamente.

Otávio Gonçalves de Santana

blog: http://otaviosantana.blogspot.com.br/ twitter: http://twitter.com/otaviojava site: http://www.otaviojava.com.br (11) 98255-3513 -------------- next part -------------- diff -r d02b062bc827 src/share/classes/sun/util/locale/provider/DictionaryBasedBreakIterator.java --- a/src/share/classes/sun/util/locale/provider/DictionaryBasedBreakIterator.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/util/locale/provider/DictionaryBasedBreakIterator.java Fri Jun 20 09:57:19 2014 -0300 @@ -461,10 +461,10 @@ if ((currentBreakPositions.size() == 0 || currentBreakPositions.peek().intValue() != text.getIndex()) && text.getIndex() != startPos) {

-------------- next part -------------- diff -r d02b062bc827 src/share/classes/sun/tools/asm/Assembler.java --- a/src/share/classes/sun/tools/asm/Assembler.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/tools/asm/Assembler.java Fri Jun 20 09:57:19 2014 -0300 @@ -558,7 +558,7 @@ case opc_tableswitch: { SwitchData sw = (SwitchData)inst.value; for (int i = sw.minValue; i <= sw.maxValue; i++) {

diff -r d02b062bc827 src/share/classes/sun/tools/asm/Instruction.java --- a/src/share/classes/sun/tools/asm/Instruction.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/tools/asm/Instruction.java Fri Jun 20 09:57:19 2014 -0300 @@ -142,7 +142,7 @@ // Don't keep the LocalVariable info around, unless we // are actually going to generate a local variable table. if ((value instanceof LocalVariable) && !env.debug_vars()) {

diff -r d02b062bc827 src/share/classes/sun/tools/java/BinaryConstantPool.java --- a/src/share/classes/sun/tools/java/BinaryConstantPool.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/tools/java/BinaryConstantPool.java Fri Jun 20 09:57:19 2014 -0300 @@ -60,13 +60,13 @@ break;

           case CONSTANT_INTEGER:

@@ -76,7 +76,7 @@ case CONSTANT_STRING: // JVM 4.4.3 CONSTANT_String_info.string_index // or JVM 4.4.1 CONSTANT_Class_info.name_index

@@ -84,7 +84,7 @@ case CONSTANT_INTERFACEMETHOD: case CONSTANT_NAMEANDTYPE: // JVM 4.4.2 CONSTANT_*ref_info.class_index & name_and_type_index

@@ -260,7 +260,7 @@ Integer result = (Integer)indexHashAscii.get(string); if (result == null) { if (MoreStuff == null) MoreStuff = new Vector();

@@ -277,10 +277,10 @@ indexHashAscii = new Hashtable(); for (int i = 1; i < cpool.length; i++) { if (types[i] == CONSTANT_UTF8) {

diff -r d02b062bc827 src/share/classes/sun/tools/java/Identifier.java --- a/src/share/classes/sun/tools/java/Identifier.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/tools/java/Identifier.java Fri Jun 20 09:57:19 2014 -0300 @@ -106,7 +106,7 @@ * Set the type of the identifier. */ void setType(int t) {

diff -r d02b062bc827 src/share/classes/sun/tools/javac/BatchEnvironment.java --- a/src/share/classes/sun/tools/javac/BatchEnvironment.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/tools/javac/BatchEnvironment.java Fri Jun 20 09:57:19 2014 -0300 @@ -1172,7 +1172,7 @@ if (!hitErrorLimit) { hitErrorLimit = true; output(errorString("too.many.errors",

diff -r d02b062bc827 src/share/classes/sun/tools/javac/Main.java --- a/src/share/classes/sun/tools/javac/Main.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/tools/javac/Main.java Fri Jun 20 09:57:19 2014 -0300 @@ -668,19 +668,18 @@ Object file1 = env.deprecationFiles.elementAt(0); if (env.deprecation()) { if (ndepfiles > 1) {

diff -r d02b062bc827 src/share/classes/sun/tools/javac/SourceMember.java --- a/src/share/classes/sun/tools/javac/SourceMember.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/tools/javac/SourceMember.java Fri Jun 20 09:57:19 2014 -0300 @@ -885,7 +885,7 @@ // instance initializers. Code for these is generated // in the makeVarInits() method of the class // MethodExpression.

diff -r d02b062bc827 src/share/classes/sun/tools/jconsole/MemoryPoolProxy.java --- a/src/share/classes/sun/tools/jconsole/MemoryPoolProxy.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/tools/jconsole/MemoryPoolProxy.java Fri Jun 20 09:57:19 2014 -0300 @@ -56,7 +56,7 @@ ObjectName mbeanName = new ObjectName(GARBAGE_COLLECTOR_MXBEAN_DOMAIN_TYPE + ",name=" + name); if (client.isRegistered(mbeanName)) {

@@ -97,7 +97,7 @@ Long gcCount = e.getValue(); Long newCount = gc.getCollectionCount(); if (newCount > gcCount) {

diff -r d02b062bc827 src/share/classes/sun/tools/jconsole/inspector/Utils.java --- a/src/share/classes/sun/tools/jconsole/inspector/Utils.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/tools/jconsole/inspector/Utils.java Fri Jun 20 09:57:19 2014 -0300 @@ -342,14 +342,14 @@ Object result; if (primitiveToWrapper.containsKey(type)) { if (type.equals(Character.TYPE.getName())) {

diff -r d02b062bc827 src/share/classes/sun/tools/jstat/Jstat.java --- a/src/share/classes/sun/tools/jstat/Jstat.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/tools/jstat/Jstat.java Fri Jun 20 09:57:19 2014 -0300 @@ -158,7 +158,7 @@ // handle target termination events for targets other than ourself HostListener terminator = new HostListener() { public void vmStatusChanged(VmStatusChangeEvent ev) {

diff -r d02b062bc827 src/share/classes/sun/tools/jstatd/RemoteHostImpl.java --- a/src/share/classes/sun/tools/jstatd/RemoteHostImpl.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/tools/jstatd/RemoteHostImpl.java Fri Jun 20 09:57:19 2014 -0300 @@ -62,7 +62,7 @@

 public RemoteVm attachVm(int lvmid, String mode)
                 throws RemoteException, MonitorException {

diff -r d02b062bc827 src/share/classes/sun/tools/tree/ArrayExpression.java --- a/src/share/classes/sun/tools/tree/ArrayExpression.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/tools/tree/ArrayExpression.java Fri Jun 20 09:57:19 2014 -0300 @@ -92,16 +92,16 @@ */ public void codeValue(Environment env, Context ctx, Assembler asm) { int t = 0;

@@ -122,7 +122,7 @@ if (args[i].equalsDefault()) continue;

         asm.add(where, opc_dup);

diff -r d02b062bc827 src/share/classes/sun/tools/tree/BinaryExpression.java --- a/src/share/classes/sun/tools/tree/BinaryExpression.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/tools/tree/BinaryExpression.java Fri Jun 20 09:57:19 2014 -0300 @@ -212,10 +212,10 @@ Label l2 = new Label();

         codeBranch(env, ctx, asm, l1, true);

diff -r d02b062bc827 src/share/classes/sun/tools/tree/BitNotExpression.java --- a/src/share/classes/sun/tools/tree/BitNotExpression.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/tools/tree/BitNotExpression.java Fri Jun 20 09:57:19 2014 -0300 @@ -80,10 +80,10 @@ public void codeValue(Environment env, Context ctx, Assembler asm) { right.codeValue(env, ctx, asm); if (type.isType(TC_INT)) {

@@ -106,7 +106,7 @@ } } public void codeValue(Environment env, Context ctx, Assembler asm) {

diff -r d02b062bc827 src/share/classes/sun/tools/tree/Expression.java --- a/src/share/classes/sun/tools/tree/Expression.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/tools/tree/Expression.java Fri Jun 20 09:57:19 2014 -0300 @@ -432,10 +432,10 @@ Label l2 = new Label();

         codeBranch(env, ctx, asm, l1, true);

diff -r d02b062bc827 src/share/classes/sun/tools/tree/FinallyStatement.java --- a/src/share/classes/sun/tools/tree/FinallyStatement.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/tools/tree/FinallyStatement.java Fri Jun 20 09:57:19 2014 -0300 @@ -287,8 +287,8 @@ // allocate space for the exception and return address f1 = new LocalMember(where, thisClass, 0, Type.tObject, null); f2 = new LocalMember(where, thisClass, 0, Type.tInt, null);

diff -r d02b062bc827 src/share/classes/sun/tools/tree/IdentifierExpression.java --- a/src/share/classes/sun/tools/tree/IdentifierExpression.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/tools/tree/IdentifierExpression.java Fri Jun 20 09:57:19 2014 -0300 @@ -452,7 +452,7 @@ } void codeLoad(Environment env, Context ctx, Assembler asm) { asm.add(where, opc_iload + type.getTypeCodeOffset(),

diff -r d02b062bc827 src/share/classes/sun/tools/tree/IncDecExpression.java --- a/src/share/classes/sun/tools/tree/IncDecExpression.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/tools/tree/IncDecExpression.java Fri Jun 20 09:57:19 2014 -0300 @@ -112,26 +112,26 @@ private void codeIncDecOp(Assembler asm, boolean inc) { switch (type.getTypeCode()) { case TC_BYTE:

diff -r d02b062bc827 src/share/classes/sun/tools/tree/InlineNewInstanceExpression.java --- a/src/share/classes/sun/tools/tree/InlineNewInstanceExpression.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/tools/tree/InlineNewInstanceExpression.java Fri Jun 20 09:57:19 2014 -0300 @@ -93,11 +93,11 @@ LocalMember v = (LocalMember)field.getArguments().elementAt(0); CodeContext newctx = new CodeContext(ctx, this); newctx.declare(env, v);

@@ -91,6 +91,6 @@ * Code */ public void codeValue(Environment env, Context ctx, Assembler asm) {

@@ -71,7 +71,7 @@ * Code */ public void codeValue(Environment env, Context ctx, Assembler asm) {

diff -r d02b062bc827 src/share/classes/sun/tools/tree/MethodExpression.java --- a/src/share/classes/sun/tools/tree/MethodExpression.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/tools/tree/MethodExpression.java Fri Jun 20 09:57:19 2014 -0300 @@ -857,7 +857,7 @@ right.code(env, ctx, asm); } } else if (right == null) {

diff -r d02b062bc827 src/share/classes/sun/tools/tree/NewArrayExpression.java --- a/src/share/classes/sun/tools/tree/NewArrayExpression.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/tools/tree/NewArrayExpression.java Fri Jun 20 09:57:19 2014 -0300 @@ -133,21 +133,21 @@

     switch (type.getElementType().getTypeCode()) {
         case TC_BOOLEAN:

diff -r d02b062bc827 src/share/classes/sun/tools/tree/NotExpression.java --- a/src/share/classes/sun/tools/tree/NotExpression.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/tools/tree/NotExpression.java Fri Jun 20 09:57:19 2014 -0300 @@ -139,7 +139,7 @@ */ public void codeValue(Environment env, Context ctx, Assembler asm) { right.codeValue(env, ctx, asm);

diff -r d02b062bc827 src/share/classes/sun/tools/tree/Statement.java --- a/src/share/classes/sun/tools/tree/Statement.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/tools/tree/Statement.java Fri Jun 20 09:57:19 2014 -0300 @@ -249,7 +249,7 @@ // Save the return value in the register which should have // been reserved. LocalMember lf = ctx.getLocalField(idFinallyReturnValue);

diff -r d02b062bc827 src/share/classes/sun/tools/tree/SynchronizedStatement.java --- a/src/share/classes/sun/tools/tree/SynchronizedStatement.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/tools/tree/SynchronizedStatement.java Fri Jun 20 09:57:19 2014 -0300 @@ -125,8 +125,8 @@

     LocalMember f1 = new LocalMember(where, clazz, 0, Type.tObject, null);
     LocalMember f2 = new LocalMember(where, clazz, 0, Type.tInt, null);

diff -r d02b062bc827 src/share/classes/sun/tools/tree/ThisExpression.java --- a/src/share/classes/sun/tools/tree/ThisExpression.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/tools/tree/ThisExpression.java Fri Jun 20 09:57:19 2014 -0300 @@ -169,7 +169,7 @@ * Code */ public void codeValue(Environment env, Context ctx, Assembler asm) {

-------------- next part -------------- diff -r d02b062bc827 src/share/classes/sun/swing/PrintingStatus.java --- a/src/share/classes/sun/swing/PrintingStatus.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/swing/PrintingStatus.java Fri Jun 20 09:57:18 2014 -0300 @@ -295,7 +295,7 @@ private void updateStatusOnEDT(int pageIndex) { assert SwingUtilities.isEventDispatchThread(); Object[] pageNumber = new Object[]{

diff -r d02b062bc827 src/share/classes/sun/security/krb5/EncryptedData.java --- a/src/share/classes/sun/security/krb5/EncryptedData.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/krb5/EncryptedData.java Fri Jun 20 09:57:18 2014 -0300 @@ -87,7 +87,7 @@ EncryptedData new_encryptedData = new EncryptedData(); new_encryptedData.eType = eType; if (kvno != null) {

@@ -241,7 +241,7 @@ if ((encoding.getData().peekByte() & 0x1F) == 1) { der = encoding.getData().getDerValue(); int i = (der.getData().getBigInteger()).intValue();

diff -r d02b062bc827 src/share/classes/sun/security/krb5/KrbApRep.java --- a/src/share/classes/sun/security/krb5/KrbApRep.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/krb5/KrbApRep.java Fri Jun 20 09:57:18 2014 -0300 @@ -180,7 +180,7 @@ Integer seqno = null;

     if (seqNumber != null)

diff -r d02b062bc827 src/share/classes/sun/security/krb5/KrbApReq.java --- a/src/share/classes/sun/security/krb5/KrbApReq.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/krb5/KrbApReq.java Fri Jun 20 09:57:18 2014 -0300 @@ -485,7 +485,7 @@ Integer seqno = null;

     if (seqNumber != null)

diff -r d02b062bc827 src/share/classes/sun/security/krb5/KrbPriv.java --- a/src/share/classes/sun/security/krb5/KrbPriv.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/krb5/KrbPriv.java Fri Jun 20 09:57:18 2014 -0300 @@ -114,10 +114,10 @@ Integer seqno = null;

                            if (timestamp != null)

diff -r d02b062bc827 src/share/classes/sun/security/krb5/KrbSafe.java --- a/src/share/classes/sun/security/krb5/KrbSafe.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/krb5/KrbSafe.java Fri Jun 20 09:57:18 2014 -0300 @@ -115,10 +115,10 @@ Integer seqno = null;

                             if (timestamp != null)

diff -r d02b062bc827 src/share/classes/sun/security/krb5/internal/Authenticator.java --- a/src/share/classes/sun/security/krb5/internal/Authenticator.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/krb5/internal/Authenticator.java Fri Jun 20 09:57:18 2014 -0300 @@ -149,7 +149,7 @@ if ((der.getData().peekByte() & 0x1F) == 0x07) { subDer = der.getData().getDerValue(); if ((subDer.getTag() & (byte) 0x1F) == (byte) 0x07) {

diff -r d02b062bc827 src/share/classes/sun/security/krb5/internal/EncAPRepPart.java --- a/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java Fri Jun 20 09:57:18 2014 -0300 @@ -117,7 +117,7 @@ if ((subDer.getTag() & 0x1F) != 0x03) { throw new Asn1Exception(Krb5.ASN1_BAD_ID); }

diff -r d02b062bc827 src/share/classes/sun/security/krb5/internal/EncKrbCredPart.java --- a/src/share/classes/sun/security/krb5/internal/EncKrbCredPart.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/krb5/internal/EncKrbCredPart.java Fri Jun 20 09:57:18 2014 -0300 @@ -140,7 +140,7 @@ if (der.getData().available() > 0) { if (((byte) (der.getData().peekByte()) & (byte) 0x1F) == (byte) 0x01) { subDer = der.getData().getDerValue();

@@ -149,7 +149,7 @@ if (der.getData().available() > 0) { if (((byte) (der.getData().peekByte()) & (byte) 0x1F) == (byte) 0x03) { subDer = der.getData().getDerValue();

diff -r d02b062bc827 src/share/classes/sun/security/krb5/internal/EncKrbPrivPart.java --- a/src/share/classes/sun/security/krb5/internal/EncKrbPrivPart.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/krb5/internal/EncKrbPrivPart.java Fri Jun 20 09:57:18 2014 -0300 @@ -115,13 +115,13 @@ timestamp = KerberosTime.parse(der.getData(), (byte) 0x01, true); if ((der.getData().peekByte() & 0x1F) == 0x02) { subDer = der.getData().getDerValue();

diff -r d02b062bc827 src/share/classes/sun/security/krb5/internal/KRBError.java --- a/src/share/classes/sun/security/krb5/internal/KRBError.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/krb5/internal/KRBError.java Fri Jun 20 09:57:18 2014 -0300 @@ -335,7 +335,7 @@ cTime = KerberosTime.parse(der.getData(), (byte)0x02, true); if ((der.getData().peekByte() & 0x1F) == 0x03) { subDer = der.getData().getDerValue();

diff -r d02b062bc827 src/share/classes/sun/security/krb5/internal/KRBSafeBody.java --- a/src/share/classes/sun/security/krb5/internal/KRBSafeBody.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/krb5/internal/KRBSafeBody.java Fri Jun 20 09:57:18 2014 -0300 @@ -104,11 +104,11 @@ timestamp = KerberosTime.parse(encoding.getData(), (byte)0x01, true); if ((encoding.getData().peekByte() & 0x1F) == 0x02) { der = encoding.getData().getDerValue();

diff -r d02b062bc827 src/share/classes/sun/security/krb5/internal/KerberosTime.java --- a/src/share/classes/sun/security/krb5/internal/KerberosTime.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/krb5/internal/KerberosTime.java Fri Jun 20 09:57:18 2014 -0300 @@ -188,7 +188,7 @@ }

 public int getMicroSeconds() {

@@ -250,7 +250,7 @@ }

 public int getSeconds() {

diff -r d02b062bc827 src/share/classes/sun/security/krb5/internal/PAEncTSEnc.java --- a/src/share/classes/sun/security/krb5/internal/PAEncTSEnc.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/krb5/internal/PAEncTSEnc.java Fri Jun 20 09:57:18 2014 -0300 @@ -67,7 +67,7 @@ public PAEncTSEnc() { KerberosTime now = KerberosTime.now(); pATimeStamp = now;

@@ -85,7 +85,7 @@ if (encoding.getData().available() > 0) { der = encoding.getData().getDerValue(); if ((der.getTag() & 0x1F) == 0x01) {

diff -r d02b062bc827 src/share/classes/sun/security/krb5/internal/ccache/CCacheInputStream.java --- a/src/share/classes/sun/security/krb5/internal/ccache/CCacheInputStream.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/krb5/internal/ccache/CCacheInputStream.java Fri Jun 20 09:57:18 2014 -0300 @@ -94,8 +94,8 @@ taglen = read(2); switch (tag) { case FCC_TAG_DELTATIME:

@@ -186,7 +186,7 @@ read(2); /* keytype recorded twice in fvno 3 */ keyLen = read(4); byte[] bytes = IOUtils.readFully(this, keyLen, true);

diff -r d02b062bc827 src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java --- a/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java Fri Jun 20 09:57:18 2014 -0300 @@ -297,7 +297,7 @@ if (EType.isSupported(entry.keyType)) { key = new EncryptionKey(entry.keyblock, entry.keyType,

diff -r d02b062bc827 src/share/classes/sun/security/krb5/internal/ktab/KeyTabEntry.java --- a/src/share/classes/sun/security/krb5/internal/ktab/KeyTabEntry.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/krb5/internal/ktab/KeyTabEntry.java Fri Jun 20 09:57:18 2014 -0300 @@ -68,7 +68,7 @@ public EncryptionKey getKey() { EncryptionKey key = new EncryptionKey(keyblock, keyType,

diff -r d02b062bc827 src/share/classes/sun/security/pkcs/PKCS9Attribute.java --- a/src/share/classes/sun/security/pkcs/PKCS9Attribute.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/pkcs/PKCS9Attribute.java Fri Jun 20 09:57:18 2014 -0300 @@ -309,26 +309,26 @@ */ private static final Byte[][] PKCS9_VALUE_TAGS = { null,

@@ -511,7 +511,7 @@ // check for illegal element tags Byte tag; for (int i=0; i < elems.length; i++) {

diff -r d02b062bc827 src/share/classes/sun/security/provider/ConfigFile.java --- a/src/share/classes/sun/security/provider/ConfigFile.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/provider/ConfigFile.java Fri Jun 20 09:57:18 2014 -0300 @@ -531,7 +531,7 @@ } else { throw ioException( "Configuration.Error.Line.line.expected.expect.found.value.",

@@ -541,7 +541,7 @@ } else { throw ioException( "Configuration.Error.Line.line.expected.expect.",

@@ -551,7 +551,7 @@ } else { throw ioException( "Configuration.Error.Line.line.expected.expect.",

@@ -561,7 +561,7 @@ } else { throw ioException( "Configuration.Error.Line.line.expected.expect.",

@@ -571,14 +571,14 @@ } else { throw ioException( "Configuration.Error.Line.line.expected.expect.",

@@ -655,7 +655,7 @@ if (s == null || s.length() == 0) { throw ioException( "Configuration.Error.Line.line.system.property.value.expanded.to.empty.value",

diff -r d02b062bc827 src/share/classes/sun/security/provider/PolicyParser.java --- a/src/share/classes/sun/security/provider/PolicyParser.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/provider/PolicyParser.java Fri Jun 20 09:57:18 2014 -0300 @@ -1405,7 +1405,7 @@ super("line " + line + ": " + msg); MessageFormat form = new MessageFormat (ResourcesMgr.getString("line.number.msg"));

@@ -1414,7 +1414,7 @@ "], found [" + actual + "]"); MessageFormat form = new MessageFormat(ResourcesMgr.getString ("line.number.expected.expect.found.actual."));

diff -r d02b062bc827 src/share/classes/sun/security/tools/keytool/Main.java --- a/src/share/classes/sun/security/tools/keytool/Main.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/tools/keytool/Main.java Fri Jun 20 09:57:18 2014 -0300 @@ -1531,7 +1531,7 @@ if (verbose) { MessageFormat form = new MessageFormat(rb.getString ("Generated.keysize.bit.keyAlgName.secret.key"));

@@ -1626,10 +1626,10 @@ if (verbose) { MessageFormat form = new MessageFormat(rb.getString ("Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for"));

@@ -1787,7 +1787,7 @@ for (int i = 0; i < chain.length; i ++) { MessageFormat form = new MessageFormat (rb.getString("Certificate.i.1."));

@@ -2062,7 +2062,7 @@ ("Your.keystore.contains.keyStore.size.entry")) : new MessageFormat(rb.getString ("Your.keystore.contains.keyStore.size.entries"));

@@ -2334,7 +2334,7 @@ if (certs.length > 1) { MessageFormat form = new MessageFormat (rb.getString("Certificate.i.1."));

diff -r d02b062bc827 src/share/classes/sun/security/util/DerIndefLenConverter.java --- a/src/share/classes/sun/security/util/DerIndefLenConverter.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/util/DerIndefLenConverter.java Fri Jun 20 09:57:18 2014 -0300 @@ -150,7 +150,7 @@ return curLen; int lenByte = data[dataPos++] & 0xff; if (isIndefinite(lenByte)) {

diff -r d02b062bc827 src/share/classes/sun/security/x509/AVA.java --- a/src/share/classes/sun/security/x509/AVA.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/x509/AVA.java Fri Jun 20 09:57:18 2014 -0300 @@ -517,7 +517,7 @@ if (hexDigits.indexOf(Character.toUpperCase((char)c2)) >= 0) { int hi = Character.digit((char)c1, 16); int lo = Character.digit((char)c2, 16);

diff -r d02b062bc827 src/share/classes/sun/security/x509/CRLReasonCodeExtension.java --- a/src/share/classes/sun/security/x509/CRLReasonCodeExtension.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/x509/CRLReasonCodeExtension.java Fri Jun 20 09:57:18 2014 -0300 @@ -125,7 +125,7 @@ */ public Integer get(String name) throws IOException { if (name.equalsIgnoreCase(REASON)) {

diff -r d02b062bc827 src/share/classes/sun/security/x509/CertificateVersion.java --- a/src/share/classes/sun/security/x509/CertificateVersion.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/x509/CertificateVersion.java Fri Jun 20 09:57:18 2014 -0300 @@ -193,7 +193,7 @@ */ public Integer get(String name) throws IOException { if (name.equalsIgnoreCase(VERSION)) {

diff -r d02b062bc827 src/share/classes/sun/security/x509/InhibitAnyPolicyExtension.java --- a/src/share/classes/sun/security/x509/InhibitAnyPolicyExtension.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/x509/InhibitAnyPolicyExtension.java Fri Jun 20 09:57:18 2014 -0300 @@ -217,7 +217,7 @@ */ public Integer get(String name) throws IOException { if (name.equalsIgnoreCase(SKIP_CERTS))

diff -r d02b062bc827 src/share/classes/sun/security/x509/PolicyConstraintsExtension.java --- a/src/share/classes/sun/security/x509/PolicyConstraintsExtension.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/x509/PolicyConstraintsExtension.java Fri Jun 20 09:57:18 2014 -0300 @@ -233,9 +233,9 @@ */ public Integer get(String name) throws IOException { if (name.equalsIgnoreCase(REQUIRE)) {

-------------- next part -------------- diff -r d02b062bc827 src/share/classes/sun/rmi/rmic/RMIGenerator.java --- a/src/share/classes/sun/rmi/rmic/RMIGenerator.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/rmi/rmic/RMIGenerator.java Fri Jun 20 09:57:18 2014 -0300 @@ -63,9 +63,9 @@

 private static final Hashtable<String, Integer> versionOptions = new Hashtable<>();
 static {

-------------- next part -------------- diff -r d02b062bc827 src/share/classes/sun/print/ServiceDialog.java --- a/src/share/classes/sun/print/ServiceDialog.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/print/ServiceDialog.java Fri Jun 20 09:57:18 2014 -0300 @@ -1017,8 +1017,8 @@ format.setParseIntegerOnly(true); format.setDecimalSeparatorAlwaysShown(false); NumberFormatter nf = new NumberFormatter(format);

@@ -1110,12 +1110,12 @@

         if (min < 1) {
             min = 1;

@@ -1165,8 +1165,8 @@ } else { // RANGE rbPages.setSelected(true); }

@@ -1275,14 +1275,14 @@ min = 1; max = Integer.MAX_VALUE; }

@@ -2763,7 +2763,7 @@ if ((value < 1) || (value > 100)) { value = 1; }

-------------- next part -------------- diff -r d02b062bc827 src/share/classes/sun/nio/ch/Util.java --- a/src/share/classes/sun/nio/ch/Util.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/nio/ch/Util.java Fri Jun 20 09:57:18 2014 -0300 @@ -328,8 +328,8 @@ initDBBConstructor(); try { dbb = (MappedByteBuffer)directByteBufferConstructor.newInstance(

@@ -373,8 +373,8 @@ initDBBRConstructor(); try { dbb = (MappedByteBuffer)directByteBufferRConstructor.newInstance(

-------------- next part -------------- diff -r d02b062bc827 src/share/classes/sun/net/NetProperties.java --- a/src/share/classes/sun/net/NetProperties.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/net/NetProperties.java Fri Jun 20 09:57:18 2014 -0300 @@ -123,7 +123,7 @@ } catch (NumberFormatException ex) { } }

-------------- next part -------------- diff -r d02b062bc827 src/share/classes/sun/misc/ProxyGenerator.java --- a/src/share/classes/sun/misc/ProxyGenerator.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/misc/ProxyGenerator.java Fri Jun 20 09:57:18 2014 -0300 @@ -1743,7 +1743,7 @@ * Get or assign the index for a CONSTANT_Integer entry. */ public short getInteger(int i) {

@@ -1885,7 +1885,7 @@ "late constant pool addition: " + key); } short i = addEntry(new ValueEntry(key));

@@ -1903,7 +1903,7 @@ throw new InternalError("late constant pool addition"); } short i = addEntry(e);

-------------- next part -------------- diff -r d02b062bc827 src/share/classes/sun/management/GcInfoCompositeData.java --- a/src/share/classes/sun/management/GcInfoCompositeData.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/GcInfoCompositeData.java Fri Jun 20 09:57:18 2014 -0300 @@ -105,10 +105,10 @@

     try {
         baseGcInfoItemValues = new Object[] {

diff -r d02b062bc827 src/share/classes/sun/management/HotspotThread.java --- a/src/share/classes/sun/management/HotspotThread.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/HotspotThread.java Fri Jun 20 09:57:18 2014 -0300 @@ -60,7 +60,7 @@ int numThreads = getInternalThreadTimes0(names, times); Map<String, Long> result = new HashMap<>(numThreads); for (int i = 0; i < numThreads; i++) {

diff -r d02b062bc827 src/share/classes/sun/management/MemoryNotifInfoCompositeData.java --- a/src/share/classes/sun/management/MemoryNotifInfoCompositeData.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/MemoryNotifInfoCompositeData.java Fri Jun 20 09:57:18 2014 -0300 @@ -60,7 +60,7 @@ final Object[] memoryNotifInfoItemValues = { memoryNotifInfo.getPoolName(), MemoryUsageCompositeData.toCompositeData(memoryNotifInfo.getUsage()),

diff -r d02b062bc827 src/share/classes/sun/management/MemoryUsageCompositeData.java --- a/src/share/classes/sun/management/MemoryUsageCompositeData.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/MemoryUsageCompositeData.java Fri Jun 20 09:57:18 2014 -0300 @@ -56,10 +56,10 @@ // CONTENTS OF THIS ARRAY MUST BE SYNCHRONIZED WITH // memoryUsageItemNames! final Object[] memoryUsageItemValues = {

diff -r d02b062bc827 src/share/classes/sun/management/MonitorInfoCompositeData.java --- a/src/share/classes/sun/management/MonitorInfoCompositeData.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/MonitorInfoCompositeData.java Fri Jun 20 09:57:18 2014 -0300 @@ -69,7 +69,7 @@ toCompositeData(ste) : null); } else if (item.equals(LOCKED_STACK_DEPTH)) {

diff -r d02b062bc827 src/share/classes/sun/management/StackTraceElementCompositeData.java --- a/src/share/classes/sun/management/StackTraceElementCompositeData.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/StackTraceElementCompositeData.java Fri Jun 20 09:57:18 2014 -0300 @@ -67,7 +67,7 @@ ste.getClassName(), ste.getMethodName(), ste.getFileName(),

diff -r d02b062bc827 src/share/classes/sun/management/ThreadInfoCompositeData.java --- a/src/share/classes/sun/management/ThreadInfoCompositeData.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/ThreadInfoCompositeData.java Fri Jun 20 09:57:18 2014 -0300 @@ -108,16 +108,16 @@ // CONTENTS OF THIS ARRAY MUST BE SYNCHRONIZED WITH // threadInfoItemNames! final Object[] threadInfoItemValues = {

diff -r d02b062bc827 src/share/classes/sun/management/counter/perf/LongCounterSnapshot.java --- a/src/share/classes/sun/management/counter/perf/LongCounterSnapshot.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/counter/perf/LongCounterSnapshot.java Fri Jun 20 09:57:18 2014 -0300 @@ -43,7 +43,7 @@ }

 public Object getValue() {

diff -r d02b062bc827 src/share/classes/sun/management/counter/perf/PerfLongCounter.java --- a/src/share/classes/sun/management/counter/perf/PerfLongCounter.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/counter/perf/PerfLongCounter.java Fri Jun 20 09:57:18 2014 -0300 @@ -42,7 +42,7 @@ }

 public Object getValue() {

diff -r d02b062bc827 src/share/classes/sun/management/jdp/JdpController.java --- a/src/share/classes/sun/management/jdp/JdpController.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/jdp/JdpController.java Fri Jun 20 09:57:18 2014 -0300 @@ -204,7 +204,7 @@ packet.setRmiHostname(rmiHostname);

     // Set broadcast interval

diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvminstr/JvmClassLoadingImpl.java --- a/src/share/classes/sun/management/snmp/jvminstr/JvmClassLoadingImpl.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvminstr/JvmClassLoadingImpl.java Fri Jun 20 09:57:18 2014 -0300 @@ -129,21 +129,21 @@ * Getter for the "JvmClassesUnloadedCount" variable. */ public Long getJvmClassesUnloadedCount() throws SnmpStatusException {

} diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvminstr/JvmCompilationImpl.java --- a/src/share/classes/sun/management/snmp/jvminstr/JvmCompilationImpl.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvminstr/JvmCompilationImpl.java Fri Jun 20 09:57:18 2014 -0300 @@ -115,7 +115,7 @@ t = getCompilationMXBean().getTotalCompilationTime(); else t = 0;

diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvminstr/JvmMemGCEntryImpl.java --- a/src/share/classes/sun/management/snmp/jvminstr/JvmMemGCEntryImpl.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvminstr/JvmMemGCEntryImpl.java Fri Jun 20 09:57:18 2014 -0300 @@ -70,7 +70,7 @@ */ // Don't bother to uses the request contextual cache for this. public Long getJvmMemGCTimeMs() throws SnmpStatusException {

@@ -78,14 +78,14 @@ */ // Don't bother to uses the request contextual cache for this. public Long getJvmMemGCCount() throws SnmpStatusException {

} diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvminstr/JvmMemManagerEntryImpl.java --- a/src/share/classes/sun/management/snmp/jvminstr/JvmMemManagerEntryImpl.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvminstr/JvmMemManagerEntryImpl.java Fri Jun 20 09:57:18 2014 -0300 @@ -79,7 +79,7 @@ * Getter for the "JvmMemManagerIndex" variable. */ public Integer getJvmMemManagerIndex() throws SnmpStatusException {

diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvminstr/JvmMemMgrPoolRelEntryImpl.java --- a/src/share/classes/sun/management/snmp/jvminstr/JvmMemMgrPoolRelEntryImpl.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvminstr/JvmMemMgrPoolRelEntryImpl.java Fri Jun 20 09:57:18 2014 -0300 @@ -92,14 +92,14 @@ * Getter for the "JvmMemManagerIndex" variable. */ public Integer getJvmMemManagerIndex() throws SnmpStatusException {

} diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvminstr/JvmMemPoolEntryImpl.java --- a/src/share/classes/sun/management/snmp/jvminstr/JvmMemPoolEntryImpl.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvminstr/JvmMemPoolEntryImpl.java Fri Jun 20 09:57:18 2014 -0300 @@ -191,7 +191,7 @@ */ public Long getJvmMemPoolMaxSize() throws SnmpStatusException { final long val = getMemoryUsage().getMax();

@@ -200,7 +200,7 @@ */ public Long getJvmMemPoolUsed() throws SnmpStatusException { final long val = getMemoryUsage().getUsed();

@@ -209,7 +209,7 @@ */ public Long getJvmMemPoolInitSize() throws SnmpStatusException { final long val = getMemoryUsage().getInit();

@@ -218,7 +218,7 @@ */ public Long getJvmMemPoolCommitted() throws SnmpStatusException { final long val = getMemoryUsage().getCommitted();

@@ -227,7 +227,7 @@ */ public Long getJvmMemPoolPeakMaxSize() throws SnmpStatusException { final long val = getPeakMemoryUsage().getMax();

@@ -236,7 +236,7 @@ */ public Long getJvmMemPoolPeakUsed() throws SnmpStatusException { final long val = getPeakMemoryUsage().getUsed();

@@ -245,7 +245,7 @@ */ public Long getJvmMemPoolPeakCommitted() throws SnmpStatusException { final long val = getPeakMemoryUsage().getCommitted();

@@ -254,7 +254,7 @@ */ public Long getJvmMemPoolCollectMaxSize() throws SnmpStatusException { final long val = getCollectMemoryUsage().getMax();

@@ -263,7 +263,7 @@ */ public Long getJvmMemPoolCollectUsed() throws SnmpStatusException { final long val = getCollectMemoryUsage().getUsed();

@@ -272,7 +272,7 @@ */ public Long getJvmMemPoolCollectCommitted() throws SnmpStatusException { final long val = getCollectMemoryUsage().getCommitted();

@@ -283,7 +283,7 @@ if (!pool.isUsageThresholdSupported()) return JvmMemoryImpl.Long0; final long val = pool.getUsageThreshold();

@@ -334,7 +334,7 @@ if (!pool.isUsageThresholdSupported()) return JvmMemoryImpl.Long0; final long val = pool.getUsageThresholdCount();

@@ -345,7 +345,7 @@ if (!pool.isCollectionUsageThresholdSupported()) return JvmMemoryImpl.Long0; final long val = pool.getCollectionUsageThreshold();

@@ -399,7 +399,7 @@ if (!pool.isCollectionUsageThresholdSupported()) return JvmMemoryImpl.Long0; final long val = pool.getCollectionUsageThresholdCount();

@@ -430,7 +430,7 @@ * Getter for the "JvmMemPoolIndex" variable. */ public Integer getJvmMemPoolIndex() throws SnmpStatusException {

@@ -450,7 +450,7 @@ */ public synchronized Long getJvmMemPoolPeakReset() throws SnmpStatusException {

diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvminstr/JvmMemoryImpl.java --- a/src/share/classes/sun/management/snmp/jvminstr/JvmMemoryImpl.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvminstr/JvmMemoryImpl.java Fri Jun 20 09:57:18 2014 -0300 @@ -222,7 +222,7 @@ } }

@@ -230,7 +230,7 @@ public Long getJvmMemoryNonHeapMaxSize() throws SnmpStatusException { final long val = getNonHeapMemoryUsage().getMax();

@@ -239,7 +239,7 @@ */ public Long getJvmMemoryNonHeapCommitted() throws SnmpStatusException { final long val = getNonHeapMemoryUsage().getCommitted();

@@ -248,7 +248,7 @@ */ public Long getJvmMemoryNonHeapUsed() throws SnmpStatusException { final long val = getNonHeapMemoryUsage().getUsed();

@@ -257,7 +257,7 @@ */ public Long getJvmMemoryNonHeapInitSize() throws SnmpStatusException { final long val = getNonHeapMemoryUsage().getInit();

@@ -266,7 +266,7 @@ */ public Long getJvmMemoryHeapMaxSize() throws SnmpStatusException { final long val = getHeapMemoryUsage().getMax();

@@ -320,7 +320,7 @@ */ public Long getJvmMemoryHeapCommitted() throws SnmpStatusException { final long val = getHeapMemoryUsage().getCommitted();

@@ -359,7 +359,7 @@ */ public Long getJvmMemoryHeapUsed() throws SnmpStatusException { final long val = getHeapMemoryUsage().getUsed();

@@ -368,7 +368,7 @@ */ public Long getJvmMemoryHeapInitSize() throws SnmpStatusException { final long val = getHeapMemoryUsage().getInit();

@@ -380,11 +380,11 @@ final long val = ManagementFactory.getMemoryMXBean(). getObjectPendingFinalizationCount();

diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvminstr/JvmOSImpl.java --- a/src/share/classes/sun/management/snmp/jvminstr/JvmOSImpl.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvminstr/JvmOSImpl.java Fri Jun 20 09:57:18 2014 -0300 @@ -82,7 +82,7 @@ * Getter for the "JvmRTProcessorCount" variable. */ public Integer getJvmOSProcessorCount() throws SnmpStatusException {

diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvminstr/JvmRTBootClassPathEntryImpl.java --- a/src/share/classes/sun/management/snmp/jvminstr/JvmRTBootClassPathEntryImpl.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvminstr/JvmRTBootClassPathEntryImpl.java Fri Jun 20 09:57:18 2014 -0300 @@ -72,7 +72,7 @@ * Getter for the "JvmRTBootClassPathIndex" variable. */ public Integer getJvmRTBootClassPathIndex() throws SnmpStatusException {

} diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvminstr/JvmRTClassPathEntryImpl.java --- a/src/share/classes/sun/management/snmp/jvminstr/JvmRTClassPathEntryImpl.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvminstr/JvmRTClassPathEntryImpl.java Fri Jun 20 09:57:18 2014 -0300 @@ -71,7 +71,7 @@ * Getter for the "JvmRTClassPathIndex" variable. */ public Integer getJvmRTClassPathIndex() throws SnmpStatusException {

} diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvminstr/JvmRTInputArgsEntryImpl.java --- a/src/share/classes/sun/management/snmp/jvminstr/JvmRTInputArgsEntryImpl.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvminstr/JvmRTInputArgsEntryImpl.java Fri Jun 20 09:57:18 2014 -0300 @@ -71,7 +71,7 @@ * Getter for the "JvmRTInputArgsIndex" variable. */ public Integer getJvmRTInputArgsIndex() throws SnmpStatusException {

} diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvminstr/JvmRTLibraryPathEntryImpl.java --- a/src/share/classes/sun/management/snmp/jvminstr/JvmRTLibraryPathEntryImpl.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvminstr/JvmRTLibraryPathEntryImpl.java Fri Jun 20 09:57:18 2014 -0300 @@ -71,7 +71,7 @@ * Getter for the "JvmRTLibraryPathIndex" variable. */ public Integer getJvmRTLibraryPathIndex() throws SnmpStatusException {

} diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvminstr/JvmRuntimeImpl.java --- a/src/share/classes/sun/management/snmp/jvminstr/JvmRuntimeImpl.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvminstr/JvmRuntimeImpl.java Fri Jun 20 09:57:18 2014 -0300 @@ -241,7 +241,7 @@

     final String[] args = getInputArguments(JvmContextFactory.
                                             getUserData());

@@ -259,14 +259,14 @@ * Getter for the "JvmRTUptimeMs" variable. */ public Long getJvmRTUptimeMs() throws SnmpStatusException {

diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvminstr/JvmThreadInstanceEntryImpl.java --- a/src/share/classes/sun/management/snmp/jvminstr/JvmThreadInstanceEntryImpl.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvminstr/JvmThreadInstanceEntryImpl.java Fri Jun 20 09:57:18 2014 -0300 @@ -139,7 +139,7 @@ "Unexpected exception: " + r); log.debug("getJvmThreadInstState",r); }

@@ -231,7 +231,7 @@ log.debug("getJvmThreadInstCpuTimeNs", "Operation not supported: " + e); }

@@ -248,14 +248,14 @@ //Monitoring is disabled if(l == -1) l = 0; }

@@ -272,14 +272,14 @@ //Monitoring is disabled if(l == -1) l = 0; }

@@ -294,7 +294,7 @@ * Getter for the "JvmThreadInstId" variable. */ public Long getJvmThreadInstId() throws SnmpStatusException {

diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvminstr/JvmThreadingImpl.java --- a/src/share/classes/sun/management/snmp/jvminstr/JvmThreadingImpl.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvminstr/JvmThreadingImpl.java Fri Jun 20 09:57:18 2014 -0300 @@ -303,28 +303,28 @@ * Getter for the "JvmThreadTotalStartedCount" variable. */ public Long getJvmThreadTotalStartedCount() throws SnmpStatusException {

@@ -332,7 +332,7 @@ */ public synchronized Long getJvmThreadPeakCountReset() throws SnmpStatusException {

diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvmmib/EnumJvmClassesVerboseLevel.java --- a/src/share/classes/sun/management/snmp/jvmmib/EnumJvmClassesVerboseLevel.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvmmib/EnumJvmClassesVerboseLevel.java Fri Jun 20 09:57:18 2014 -0300 @@ -49,10 +49,10 @@ protected static Hashtable<String, Integer> stringTable = new Hashtable<>(); static {

diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvmmib/EnumJvmJITCompilerTimeMonitoring.java --- a/src/share/classes/sun/management/snmp/jvmmib/EnumJvmJITCompilerTimeMonitoring.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvmmib/EnumJvmJITCompilerTimeMonitoring.java Fri Jun 20 09:57:18 2014 -0300 @@ -49,10 +49,10 @@ protected static Hashtable<String, Integer> stringTable = new Hashtable<>(); static {

diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemManagerState.java --- a/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemManagerState.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemManagerState.java Fri Jun 20 09:57:18 2014 -0300 @@ -50,10 +50,10 @@ protected static Hashtable<String, Integer> stringTable = new Hashtable<>(); static {

diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolCollectThreshdSupport.java --- a/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolCollectThreshdSupport.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolCollectThreshdSupport.java Fri Jun 20 09:57:18 2014 -0300 @@ -49,10 +49,10 @@ protected static Hashtable<String, Integer> stringTable = new Hashtable<>(); static {

diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolState.java --- a/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolState.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolState.java Fri Jun 20 09:57:18 2014 -0300 @@ -49,10 +49,10 @@ protected static Hashtable<String, Integer> stringTable = new Hashtable<>(); static {

diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolThreshdSupport.java --- a/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolThreshdSupport.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolThreshdSupport.java Fri Jun 20 09:57:18 2014 -0300 @@ -49,10 +49,10 @@ protected static Hashtable<String, Integer> stringTable = new Hashtable<>(); static {

diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolType.java --- a/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolType.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolType.java Fri Jun 20 09:57:18 2014 -0300 @@ -49,10 +49,10 @@ protected static Hashtable<String, Integer> stringTable = new Hashtable<>(); static {

diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemoryGCCall.java --- a/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemoryGCCall.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemoryGCCall.java Fri Jun 20 09:57:18 2014 -0300 @@ -49,16 +49,16 @@ protected static Hashtable<String, Integer> stringTable = new Hashtable<>(); static {

diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemoryGCVerboseLevel.java --- a/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemoryGCVerboseLevel.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemoryGCVerboseLevel.java Fri Jun 20 09:57:18 2014 -0300 @@ -49,10 +49,10 @@ protected static Hashtable<String, Integer> stringTable = new Hashtable<>(); static {

diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvmmib/EnumJvmRTBootClassPathSupport.java --- a/src/share/classes/sun/management/snmp/jvmmib/EnumJvmRTBootClassPathSupport.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvmmib/EnumJvmRTBootClassPathSupport.java Fri Jun 20 09:57:18 2014 -0300 @@ -49,10 +49,10 @@ protected static Hashtable<String, Integer> stringTable = new Hashtable<>(); static {

diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvmmib/EnumJvmThreadContentionMonitoring.java --- a/src/share/classes/sun/management/snmp/jvmmib/EnumJvmThreadContentionMonitoring.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvmmib/EnumJvmThreadContentionMonitoring.java Fri Jun 20 09:57:18 2014 -0300 @@ -49,12 +49,12 @@ protected static Hashtable<String, Integer> stringTable = new Hashtable<>(); static {

diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvmmib/EnumJvmThreadCpuTimeMonitoring.java --- a/src/share/classes/sun/management/snmp/jvmmib/EnumJvmThreadCpuTimeMonitoring.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvmmib/EnumJvmThreadCpuTimeMonitoring.java Fri Jun 20 09:57:18 2014 -0300 @@ -49,12 +49,12 @@ protected static Hashtable<String, Integer> stringTable = new Hashtable<>(); static {

-------------- next part -------------- diff -r d02b062bc827 src/share/classes/sun/jvmstat/perfdata/monitor/AbstractPerfDataBuffer.java --- a/src/share/classes/sun/jvmstat/perfdata/monitor/AbstractPerfDataBuffer.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/jvmstat/perfdata/monitor/AbstractPerfDataBuffer.java Fri Jun 20 09:57:17 2014 -0300 @@ -174,9 +174,8 @@ Integer.TYPE });

diff -r d02b062bc827 src/share/classes/sun/jvmstat/perfdata/monitor/PerfIntegerMonitor.java --- a/src/share/classes/sun/jvmstat/perfdata/monitor/PerfIntegerMonitor.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/jvmstat/perfdata/monitor/PerfIntegerMonitor.java Fri Jun 20 09:57:17 2014 -0300 @@ -67,7 +67,7 @@ * return type is guaranteed to be of type Integer. */ public Object getValue() {

diff -r d02b062bc827 src/share/classes/sun/jvmstat/perfdata/monitor/PerfLongMonitor.java --- a/src/share/classes/sun/jvmstat/perfdata/monitor/PerfLongMonitor.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/jvmstat/perfdata/monitor/PerfLongMonitor.java Fri Jun 20 09:57:17 2014 -0300 @@ -66,7 +66,7 @@ * return type is guaranteed to be of type Long. */ public Object getValue() {

diff -r d02b062bc827 src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/LocalVmManager.java --- a/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/LocalVmManager.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/LocalVmManager.java Fri Jun 20 09:57:17 2014 -0300 @@ -156,8 +156,7 @@ if (files != null) { for (int j = 0; j < files.length; j++) { if (files[j].isFile() && files[j].canRead()) {

@@ -175,8 +174,7 @@ if (files != null) { for (int j = 0; j < files.length; j++) { if (files[j].isFile() && files[j].canRead()) {

@@ -187,8 +185,7 @@ if (files != null) { for (int j = 0; j < files.length; j++) { if (files[j].isFile() && files[j].canRead()) {

diff -r d02b062bc827 src/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/RemoteVmManager.java --- a/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/RemoteVmManager.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/RemoteVmManager.java Fri Jun 20 09:57:17 2014 -0300 @@ -106,7 +106,7 @@ Set activeSet = new HashSet(active.length);

     for (int i = 0; i < active.length; i++) {

-------------- next part -------------- diff -r d02b062bc827 src/share/classes/sun/java2d/SunGraphics2D.java --- a/src/share/classes/sun/java2d/SunGraphics2D.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/java2d/SunGraphics2D.java Fri Jun 20 09:57:17 2014 -0300 @@ -1322,7 +1322,7 @@ return SunHints.Value.get(SunHints.INTKEY_FRACTIONALMETRICS, fractionalMetricsHint); case SunHints.INTKEY_AATEXT_LCD_CONTRAST:

-------------- next part -------------- diff -r d02b062bc827 src/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java --- a/src/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java Fri Jun 20 09:57:17 2014 -0300 @@ -1857,8 +1857,7 @@ v += 2; break; case 'B': // pointer to CONSTANT_Byte

@@ -1868,13 +1867,11 @@ v += 2; break; case 'S': // pointer to CONSTANT_Short

@@ -2498,11 +2495,11 @@ int index = items[item]; switch (b[index - 1]) { case ClassWriter.INT:

diff -r d02b062bc827 src/share/classes/jdk/internal/org/objectweb/asm/Opcodes.java --- a/src/share/classes/jdk/internal/org/objectweb/asm/Opcodes.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/jdk/internal/org/objectweb/asm/Opcodes.java Fri Jun 20 09:57:17 2014 -0300 @@ -175,13 +175,13 @@ */ int F_SAME1 = 4;

diff -r d02b062bc827 src/share/classes/jdk/internal/org/objectweb/asm/commons/GeneratorAdapter.java --- a/src/share/classes/jdk/internal/org/objectweb/asm/commons/GeneratorAdapter.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/jdk/internal/org/objectweb/asm/commons/GeneratorAdapter.java Fri Jun 20 09:57:17 2014 -0300 @@ -408,7 +408,7 @@ } else if (value >= Short.MIN_VALUE && value <= Short.MAX_VALUE) { mv.visitIntInsn(Opcodes.SIPUSH, value); } else {

@@ -422,7 +422,7 @@ if (value == 0L || value == 1L) { mv.visitInsn(Opcodes.LCONST_0 + (int) value); } else {

diff -r d02b062bc827 src/share/classes/jdk/internal/org/objectweb/asm/commons/InstructionAdapter.java --- a/src/share/classes/jdk/internal/org/objectweb/asm/commons/InstructionAdapter.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/jdk/internal/org/objectweb/asm/commons/InstructionAdapter.java Fri Jun 20 09:57:17 2014 -0300 @@ -737,7 +737,7 @@ } else if (cst >= Short.MIN_VALUE && cst <= Short.MAX_VALUE) { mv.visitIntInsn(Opcodes.SIPUSH, cst); } else {

@@ -745,7 +745,7 @@ if (cst == 0L || cst == 1L) { mv.visitInsn(Opcodes.LCONST_0 + (int) cst); } else {

diff -r d02b062bc827 src/share/classes/jdk/internal/org/objectweb/asm/commons/SerialVersionUIDAdder.java --- a/src/share/classes/jdk/internal/org/objectweb/asm/commons/SerialVersionUIDAdder.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/jdk/internal/org/objectweb/asm/commons/SerialVersionUIDAdder.java Fri Jun 20 09:57:17 2014 -0300 @@ -366,8 +366,7 @@

 protected void addSVUID(long svuid) {
     FieldVisitor fv = super.visitField(Opcodes.ACC_FINAL

diff -r d02b062bc827 src/share/classes/jdk/internal/org/objectweb/asm/tree/LookupSwitchInsnNode.java --- a/src/share/classes/jdk/internal/org/objectweb/asm/tree/LookupSwitchInsnNode.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/jdk/internal/org/objectweb/asm/tree/LookupSwitchInsnNode.java Fri Jun 20 09:57:17 2014 -0300 @@ -110,7 +110,7 @@ : labels.length); if (keys != null) { for (int i = 0; i < keys.length; ++i) {

diff -r d02b062bc827 src/share/classes/jdk/internal/org/objectweb/asm/util/CheckMethodAdapter.java --- a/src/share/classes/jdk/internal/org/objectweb/asm/util/CheckMethodAdapter.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/jdk/internal/org/objectweb/asm/util/CheckMethodAdapter.java Fri Jun 20 09:57:17 2014 -0300 @@ -802,7 +802,7 @@ if (labels.get(label) != null) { throw new IllegalArgumentException("Already visited label"); }

diff -r d02b062bc827 src/share/classes/jdk/internal/org/objectweb/asm/util/Textifier.java --- a/src/share/classes/jdk/internal/org/objectweb/asm/util/Textifier.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/jdk/internal/org/objectweb/asm/util/Textifier.java Fri Jun 20 09:57:17 2014 -0300 @@ -732,7 +732,7 @@ Textifier t = createTextifier(); text.add(t.getText()); text.add(visible ? ") // parameter " : ") // invisible, parameter ");

diff -r d02b062bc827 src/share/classes/javax/swing/JLayeredPane.java --- a/src/share/classes/javax/swing/JLayeredPane.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/javax/swing/JLayeredPane.java Fri Jun 20 09:57:17 2014 -0300 @@ -295,7 +295,7 @@ /// MAKE SURE THIS AND setLayer(Component c, int layer, int position) are SYNCED Integer layerObj;

@@ -626,7 +626,7 @@ layerObj = DRAG_LAYER; break; default:

@@ -928,7 +928,7 @@ */ public Number getMaximumAccessibleValue() { // TIGER - 4422362

diff -r d02b062bc827 src/share/classes/javax/swing/filechooser/FileSystemView.java --- a/src/share/classes/javax/swing/filechooser/FileSystemView.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/javax/swing/filechooser/FileSystemView.java Fri Jun 20 09:57:17 2014 -0300 @@ -645,7 +645,7 @@ int i = 1; while (newFolder.exists() && i < 100) { newFolder = createFileObject(containingDir, MessageFormat.format(

@@ -754,7 +754,7 @@ int i = 2; while (newFolder.exists() && i < 100) { newFolder = createFileObject(containingDir, MessageFormat.format(

diff -r d02b062bc827 src/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java --- a/src/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java Fri Jun 20 09:57:17 2014 -0300 @@ -455,10 +455,10 @@ initResourceBundle(table);

     // *** Shared Integers

@@ -673,7 +673,7 @@ Object editorMargin = threeInsets;

     Object caretBlinkRate = fiveHundred;

@@ -1087,10 +1087,10 @@ "Menu.margin", twoInsets, "Menu.checkIcon", menuItemCheckIcon, "Menu.arrowIcon", menuArrowIcon,

@@ -1188,10 +1188,10 @@ "ProgressBar.selectionForeground", control, "ProgressBar.selectionBackground", textHighlight, "ProgressBar.border", progressBarBorder,

@@ -1236,7 +1236,7 @@ "LEFT", "positiveUnitIncrement", "KP_LEFT", "positiveUnitIncrement", }),

@@ -1332,7 +1332,7 @@ "SplitPane.shadow", controlShadow, "SplitPane.darkShadow", controlDkShadow, "SplitPane.border", splitPaneBorder,

@@ -1377,7 +1377,7 @@ "TabbedPane.selectedTabPadInsets", tabbedPaneTabPadInsets, "TabbedPane.tabAreaInsets", tabbedPaneTabAreaInsets, "TabbedPane.contentBorderInsets", tabbedPaneContentBorderInsets,

@@ -1737,9 +1737,9 @@ "Tree.selectionBorderColor", black, "Tree.dropLineColor", controlShadow, "Tree.editorBorder", blackLineBorder,

diff -r d02b062bc827 src/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java --- a/src/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java Fri Jun 20 09:57:17 2014 -0300 @@ -633,7 +633,7 @@ LazyValue toolBarBorder = t -> new MetalBorders.ToolBarBorder();

     LazyValue progressBarBorder = t ->

@@ -851,8 +851,8 @@ "Slider.foreground", primaryControlShadow, "Slider.focus", focusColor, "Slider.focusInsets", zeroInsets,

@@ -914,7 +914,7 @@ new MetalBorders.OptionDialogBorder(), "InternalFrame.paletteBorder",(LazyValue) t -> new MetalBorders.PaletteBorder(),

@@ -1067,7 +1067,7 @@ "ScrollBar.thumb", primaryControlShadow, "ScrollBar.thumbShadow", primaryControlDarkShadow, "ScrollBar.thumbHighlight", primaryControl,

@@ -1238,8 +1238,8 @@ "Menu.borderPainted", Boolean.TRUE, "Menu.menuPopupOffsetX", zero, "Menu.menuPopupOffsetY", zero,

@@ -1354,7 +1354,7 @@

         // SplitPane

diff -r d02b062bc827 src/share/classes/javax/swing/plaf/synth/SynthParser.java --- a/src/share/classes/javax/swing/plaf/synth/SynthParser.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/javax/swing/plaf/synth/SynthParser.java Fri Jun 20 09:57:17 2014 -0300 @@ -763,7 +763,7 @@ break; case 4: // integer try {

diff -r d02b062bc827 src/share/classes/javax/swing/text/JTextComponent.java --- a/src/share/classes/javax/swing/text/JTextComponent.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/javax/swing/text/JTextComponent.java Fri Jun 20 09:57:17 2014 -0300 @@ -2554,8 +2554,7 @@ int mark = e.getMark(); if (caretPos != dot) { // the caret moved

diff -r d02b062bc827 src/share/classes/javax/swing/text/html/CSS.java --- a/src/share/classes/javax/swing/text/html/CSS.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/javax/swing/text/html/CSS.java Fri Jun 20 09:57:17 2014 -0300 @@ -1748,13 +1748,13 @@ return Boolean.FALSE; } else if (key == StyleConstants.Alignment) { if (svalue.equals("right")) {

diff -r d02b062bc827 src/share/classes/javax/swing/text/html/HTMLDocument.java --- a/src/share/classes/javax/swing/text/html/HTMLDocument.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/javax/swing/text/html/HTMLDocument.java Fri Jun 20 09:57:17 2014 -0300 @@ -623,7 +623,7 @@ * @param n the number of tokens to buffer */ public void setTokenThreshold(int n) {

diff -r d02b062bc827 src/share/classes/javax/swing/text/rtf/RTFGenerator.java --- a/src/share/classes/javax/swing/text/rtf/RTFGenerator.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/javax/swing/text/rtf/RTFGenerator.java Fri Jun 20 09:57:17 2014 -0300 @@ -165,14 +165,14 @@ foregroundColor = StyleConstants.getForeground(a); if (foregroundColor != null && colorTable.get(foregroundColor) == null) {

@@ -183,7 +183,7 @@

     if (fontName != null &&
         fontTable.get(fontName) == null) {

-------------- next part -------------- diff -r d02b062bc827 src/share/classes/javax/sound/midi/MidiSystem.java --- a/src/share/classes/javax/sound/midi/MidiSystem.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/javax/sound/midi/MidiSystem.java Fri Jun 20 09:57:17 2014 -0300 @@ -914,7 +914,7 @@ MidiFileWriter writer = (MidiFileWriter) providers.get(i); int[] types = writer.getMidiFileTypes(); for (int j = 0; j < types.length; j++ ) {

@@ -968,7 +968,7 @@ MidiFileWriter writer = (MidiFileWriter) providers.get(i); int[] types = writer.getMidiFileTypes(sequence); for (int j = 0; j < types.length; j++ ) {

-------------- next part -------------- diff -r d02b062bc827 src/share/classes/javax/management/loading/MLet.java --- a/src/share/classes/javax/management/loading/MLet.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/javax/management/loading/MLet.java Fri Jun 20 09:57:17 2014 -0300 @@ -1307,13 +1307,13 @@ if (type.compareTo("java.lang.Boolean") == 0) return Boolean.valueOf(param); if (type.compareTo("java.lang.Byte") == 0)

diff -r d02b062bc827 src/share/classes/javax/management/modelmbean/RequiredModelMBean.java --- a/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java Fri Jun 20 09:57:17 2014 -0300 @@ -544,7 +544,7 @@ }

         // convert seconds to milliseconds for time comparison

@@ -580,7 +580,7 @@ if (tStamp == null) tStamp = "0";

diff -r d02b062bc827 src/share/classes/javax/management/relation/RelationService.java --- a/src/share/classes/javax/management/relation/RelationService.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/javax/management/relation/RelationService.java Fri Jun 20 09:57:17 2014 -0300 @@ -3208,7 +3208,7 @@ // End of check :) RELATION_LOGGER.exiting(RelationService.class.getName(), "checkRoleInt");

@@ -3218,7 +3218,7 @@ if (!isWritable) { RELATION_LOGGER.exiting(RelationService.class.getName(), "checkRoleInt");

@@ -3229,7 +3229,7 @@ if (!chkMinFlag) { RELATION_LOGGER.exiting(RelationService.class.getName(), "checkRoleInt");

@@ -3237,7 +3237,7 @@ if (!chkMaxFlag) { RELATION_LOGGER.exiting(RelationService.class.getName(), "checkRoleInt");

@@ -3254,7 +3254,7 @@ if (currObjName == null) { RELATION_LOGGER.exiting(RelationService.class.getName(), "checkRoleInt");

@@ -3265,19 +3265,19 @@ if (!classSts) { RELATION_LOGGER.exiting(RelationService.class.getName(), "checkRoleInt");

-------------- next part -------------- diff -r d02b062bc827 src/share/classes/javax/imageio/spi/PartiallyOrderedSet.java --- a/src/share/classes/javax/imageio/spi/PartiallyOrderedSet.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/javax/imageio/spi/PartiallyOrderedSet.java Fri Jun 20 09:57:17 2014 -0300 @@ -170,7 +170,7 @@ while (iter.hasNext()) { DigraphNode node = iter.next(); int inDegree = node.getInDegree();

@@ -191,7 +191,7 @@ while (outNodes.hasNext()) { DigraphNode node = outNodes.next(); int inDegree = inDegrees.get(node).intValue() - 1;

-------------- next part -------------- diff -r d02b062bc827 src/share/classes/java/util/Locale.java --- a/src/share/classes/java/util/Locale.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/java/util/Locale.java Fri Jun 20 09:57:17 2014 -0300 @@ -1924,7 +1924,7 @@ // the qualifier; if there are no qualifiers, the third element is // unused by the format pattern. Object[] displayNames = {

@@ -2078,7 +2078,7 @@ // Rebuild the argument list with the list length as the first element Object[] args = new Object[stringList.length + 1]; System.arraycopy(stringList, 0, args, 1, stringList.length);

diff -r d02b062bc827 src/share/classes/java/util/prefs/XmlSupport.java --- a/src/share/classes/java/util/prefs/XmlSupport.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/java/util/prefs/XmlSupport.java Fri Jun 20 09:57:17 2014 -0300 @@ -262,7 +262,7 @@ try { TransformerFactory tf = TransformerFactory.newInstance(); try {

-------------- next part -------------- diff -r d02b062bc827 src/share/classes/java/text/DecimalFormat.java --- a/src/share/classes/java/text/DecimalFormat.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/java/text/DecimalFormat.java Fri Jun 20 09:57:16 2014 -0300 @@ -2094,7 +2094,7 @@ }

         return gotDouble ?

-------------- next part -------------- diff -r d02b062bc827 src/share/classes/java/nio/charset/CoderResult.java --- a/src/share/classes/java/nio/charset/CoderResult.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/java/nio/charset/CoderResult.java Fri Jun 20 09:57:16 2014 -0300 @@ -200,7 +200,7 @@ private synchronized CoderResult get(int len) { if (len <= 0) throw new IllegalArgumentException("Non-positive length");

-------------- next part -------------- diff -r d02b062bc827 src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java --- a/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java Fri Jun 20 09:57:16 2014 -0300 @@ -322,13 +322,13 @@

     switch (optID) {
         case SO_TIMEOUT:

diff -r d02b062bc827 src/share/classes/java/net/AbstractPlainSocketImpl.java --- a/src/share/classes/java/net/AbstractPlainSocketImpl.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/java/net/AbstractPlainSocketImpl.java Fri Jun 20 09:57:16 2014 -0300 @@ -279,7 +279,7 @@ throw new SocketException("Socket Closed"); } if (opt == SO_TIMEOUT) {

@@ -299,7 +299,7 @@ return Boolean.valueOf(ret != -1); case SO_LINGER: ret = socketGetOption(opt, null);

@@ -310,13 +310,13 @@ case SO_SNDBUF: case SO_RCVBUF: ret = socketGetOption(opt, null);

diff -r d02b062bc827 src/share/classes/java/net/DatagramSocket.java --- a/src/share/classes/java/net/DatagramSocket.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/java/net/DatagramSocket.java Fri Jun 20 09:57:16 2014 -0300 @@ -858,7 +858,7 @@ public synchronized void setSoTimeout(int timeout) throws SocketException { if (isClosed()) throw new SocketException("Socket is closed");

@@ -920,7 +920,7 @@ } if (isClosed()) throw new SocketException("Socket is closed");

@@ -978,7 +978,7 @@ } if (isClosed()) throw new SocketException("Socket is closed");

@@ -1040,7 +1040,7 @@ throw new SocketException("Socket is closed"); // Integer instead of Boolean for compatibility with older DatagramSocketImpl if (oldImpl)

diff -r d02b062bc827 src/share/classes/java/net/ServerSocket.java --- a/src/share/classes/java/net/ServerSocket.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/java/net/ServerSocket.java Fri Jun 20 09:57:16 2014 -0300 @@ -650,7 +650,7 @@ public synchronized void setSoTimeout(int timeout) throws SocketException { if (isClosed()) throw new SocketException("Socket is closed");

@@ -847,7 +847,7 @@ } if (isClosed()) throw new SocketException("Socket is closed");

diff -r d02b062bc827 src/share/classes/java/net/Socket.java --- a/src/share/classes/java/net/Socket.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/java/net/Socket.java Fri Jun 20 09:57:16 2014 -0300 @@ -1024,7 +1024,7 @@ } if (linger > 65535) linger = 65535;

@@ -1140,7 +1140,7 @@ if (timeout < 0) throw new IllegalArgumentException("timeout can't be negative");

@@ -1196,7 +1196,7 @@ } if (isClosed()) throw new SocketException("Socket is closed");

@@ -1270,7 +1270,7 @@ } if (isClosed()) throw new SocketException("Socket is closed");

@@ -1380,7 +1380,7 @@

     if (isClosed())
         throw new SocketException("Socket is closed");

-------------- next part -------------- diff -r d02b062bc827 src/share/classes/java/lang/ConditionalSpecialCasing.java --- a/src/share/classes/java/lang/ConditionalSpecialCasing.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/java/lang/ConditionalSpecialCasing.java Fri Jun 20 09:57:16 2014 -0300 @@ -147,7 +147,7 @@ }

 private static char[] lookUpTable(String src, int index, Locale locale, boolean bLowerCasing) {

-------------- next part -------------- diff -r d02b062bc827 src/share/classes/javax/crypto/CryptoPolicyParser.java --- a/src/share/classes/javax/crypto/CryptoPolicyParser.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/javax/crypto/CryptoPolicyParser.java Fri Jun 20 09:57:17 2014 -0300 @@ -256,11 +256,11 @@ while (peek(",")) { match(","); if (peek("number")) {

-------------- next part -------------- diff -r d02b062bc827 src/share/classes/java/beans/EventHandler.java --- a/src/share/classes/java/beans/EventHandler.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/java/beans/EventHandler.java Fri Jun 20 09:57:16 2014 -0300 @@ -437,7 +437,7 @@ if (method.getDeclaringClass() == Object.class) { // Handle the Object public methods. if (methodName.equals("hashCode")) {

diff -r d02b062bc827 src/share/classes/java/beans/MetaData.java --- a/src/share/classes/java/beans/MetaData.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/java/beans/MetaData.java Fri Jun 20 09:57:16 2014 -0300 @@ -123,13 +123,13 @@ Class<?> oldClass = oldInstance.getClass(); return new Expression(oldInstance, Array.class, "newInstance", new Object[]{oldClass.getComponentType(),

@@ -635,7 +635,7 @@ newSize = 0; } for (int i = 0; i < newSize; i++) {

@@ -892,7 +892,7 @@ protected Expression instantiate(Object oldInstance, Encoder out) { java.awt.MenuShortcut m = (java.awt.MenuShortcut)oldInstance; return new Expression(oldInstance, m.getClass(), "new",

diff -r d02b062bc827 src/share/classes/java/beans/NameGenerator.java --- a/src/share/classes/java/beans/NameGenerator.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/java/beans/NameGenerator.java Fri Jun 20 09:57:16 2014 -0300 @@ -107,7 +107,7 @@

         Integer size = nameToCount.get(className);
         int instanceNumber = (size == null) ? 0 : (size).intValue() + 1;

diff -r d02b062bc827 src/share/classes/java/beans/Statement.java --- a/src/share/classes/java/beans/Statement.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/java/beans/Statement.java Fri Jun 20 09:57:16 2014 -0300 @@ -248,7 +248,7 @@ // ignored elsewhere. if (target == Character.class && arguments.length == 1 && argClasses[0] == String.class) {

-------------- next part -------------- diff -r d02b062bc827 src/share/classes/java/awt/Component.java --- a/src/share/classes/java/awt/Component.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/java/awt/Component.java Fri Jun 20 09:57:16 2014 -0300 @@ -8506,7 +8506,7 @@ if (changeSupport == null || oldValue == newValue) { return; }

diff -r d02b062bc827 src/share/classes/java/awt/image/renderable/ParameterBlock.java --- a/src/share/classes/java/awt/image/renderable/ParameterBlock.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/java/awt/image/renderable/ParameterBlock.java Fri Jun 20 09:57:16 2014 -0300 @@ -337,7 +337,7 @@ * the specified parameter. */ public ParameterBlock add(byte b) {

@@ -348,7 +348,7 @@ * the specified parameter. */ public ParameterBlock add(char c) {

@@ -359,7 +359,7 @@ * the specified parameter. */ public ParameterBlock add(short s) {

@@ -370,7 +370,7 @@ * the specified parameter. */ public ParameterBlock add(int i) {

@@ -381,7 +381,7 @@ * the specified parameter. */ public ParameterBlock add(long l) {

@@ -441,7 +441,7 @@ * the specified parameter. */ public ParameterBlock set(byte b, int index) {

@@ -457,7 +457,7 @@ * the specified parameter. */ public ParameterBlock set(char c, int index) {

@@ -473,7 +473,7 @@ * the specified parameter. */ public ParameterBlock set(short s, int index) {

@@ -489,7 +489,7 @@ * the specified parameter. */ public ParameterBlock set(int i, int index) {

@@ -505,7 +505,7 @@ * the specified parameter. */ public ParameterBlock set(long l, int index) {

-------------- next part -------------- diff -r d02b062bc827 src/share/classes/com/sun/tools/example/debug/gui/ContextManager.java --- a/src/share/classes/com/sun/tools/example/debug/gui/ContextManager.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/tools/example/debug/gui/ContextManager.java Fri Jun 20 09:57:16 2014 -0300 @@ -211,7 +211,7 @@ }

 private void setCurrentFrameIndex(ThreadInfo tinfo, int index) {

diff -r d02b062bc827 src/share/classes/com/sun/tools/example/debug/tty/Commands.java --- a/src/share/classes/com/sun/tools/example/debug/tty/Commands.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/tools/example/debug/tty/Commands.java Fri Jun 20 09:57:16 2014 -0300 @@ -84,7 +84,7 @@ MessageOutput.println("Current thread isnt suspended."); } catch (ArrayIndexOutOfBoundsException e) { MessageOutput.println("Requested stack frame is no longer active:",

@@ -935,21 +935,21 @@ try { methodInfo = loc.sourceName() + MessageOutput.format("line number",

@@ -2093,8 +2093,8 @@ VirtualMachineManager vmm) { MessageOutput.println("minus version", new Object [] { debuggerName,

diff -r d02b062bc827 src/share/classes/com/sun/tools/example/debug/tty/TTY.java --- a/src/share/classes/com/sun/tools/example/debug/tty/TTY.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/tools/example/debug/tty/TTY.java Fri Jun 20 09:57:16 2014 -0300 @@ -241,8 +241,7 @@ } if (line != null) { MessageOutput.println("source line number and line",

diff -r d02b062bc827 src/share/classes/com/sun/tools/hat/internal/model/JavaLazyReadObject.java --- a/src/share/classes/com/sun/tools/hat/internal/model/JavaLazyReadObject.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/tools/hat/internal/model/JavaLazyReadObject.java Fri Jun 20 09:57:16 2014 -0300 @@ -100,9 +100,9 @@ // make Integer or Long for given object ID protected static Number makeId(long id) { if ((id & ~Snapshot.SMALL_ID_MASK) == 0) {

diff -r d02b062bc827 src/share/classes/com/sun/tools/hat/internal/model/Snapshot.java --- a/src/share/classes/com/sun/tools/hat/internal/model/Snapshot.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/tools/hat/internal/model/Snapshot.java Fri Jun 20 09:57:16 2014 -0300 @@ -581,9 +581,9 @@ // Internals only below this point private Number makeId(long id) { if (identifierSize == 4) {

diff -r d02b062bc827 src/share/classes/com/sun/tools/hat/internal/parser/HprofReader.java --- a/src/share/classes/com/sun/tools/hat/internal/parser/HprofReader.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/tools/hat/internal/parser/HprofReader.java Fri Jun 20 09:57:16 2014 -0300 @@ -215,7 +215,7 @@ long id = readID(); byte[] chars = new byte[(int)length - identifierSize]; in.readFully(chars);

@@ -223,11 +223,11 @@ long classID = readID(); int stackTraceSerialNo = in.readInt(); long classNameID = readID();

@@ -297,13 +297,13 @@ String methodSig = getNameFromID(readID()); String sourceFile = getNameFromID(readID()); int classSer = in.readInt();

@@ -319,13 +319,12 @@ StackFrame[] frames = new StackFrame[in.readInt()]; for (int i = 0; i < frames.length; i++) { long fid = readID();

@@ -404,8 +403,7 @@ int threadSeq = in.readInt(); int stackSeq = in.readInt(); bytesLeft -= identifierSize + 8;

@@ -610,7 +608,7 @@

 private ThreadObject getThreadObjectFromSequence(int threadSeq)
         throws IOException {

@@ -619,7 +617,7 @@ }

 private String getNameFromID(long id) throws IOException {

@@ -638,7 +636,7 @@ if (stackTraces == null) { return null; }

@@ -703,7 +701,7 @@ String signature = "" + ((char) type); fields[i] = new JavaField(fieldName, signature); }

diff -r d02b062bc827 src/share/classes/com/sun/tools/hat/internal/server/ObjectQuery.java --- a/src/share/classes/com/sun/tools/hat/internal/server/ObjectQuery.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/tools/hat/internal/server/ObjectQuery.java Fri Jun 20 09:57:16 2014 -0300 @@ -99,7 +99,7 @@ final JavaField[] fields = obj.getClazz().getFieldsForInstance(); Integer[] hack = new Integer[things.length]; for (int i = 0; i < things.length; i++) {

diff -r d02b062bc827 src/share/classes/com/sun/tools/hat/internal/server/RefsByTypeQuery.java --- a/src/share/classes/com/sun/tools/hat/internal/server/RefsByTypeQuery.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/tools/hat/internal/server/RefsByTypeQuery.java Fri Jun 20 09:57:16 2014 -0300 @@ -63,9 +63,9 @@ } Long count = referrersStat.get(cl); if (count == null) {

@@ -75,9 +75,9 @@ JavaClass cl = obj.getClazz(); Long count = refereesStat.get(cl); if (count == null) {

diff -r d02b062bc827 src/share/classes/com/sun/tools/jdi/ConcreteMethodImpl.java --- a/src/share/classes/com/sun/tools/jdi/ConcreteMethodImpl.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/tools/jdi/ConcreteMethodImpl.java Fri Jun 20 09:57:16 2014 -0300 @@ -143,7 +143,7 @@ * Find the locations which match the line number * passed in. */

@@ -329,7 +329,7 @@ lineLocations.add(loc);

             // Add to the line -> locations map

@@ -399,7 +399,7 @@ lineLocations.add(loc);

             // Add to the line -> locations map

diff -r d02b062bc827 src/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java --- a/src/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java Fri Jun 20 09:57:16 2014 -0300 @@ -781,7 +781,7 @@ type.setSignature(signature); }

@@ -809,7 +809,7 @@ if (comp == 0) { matches++; iter.remove();

@@ -895,7 +895,7 @@ ReferenceTypeImpl retType = null; synchronized (this) { if (typesByID != null) {

@@ -1247,7 +1247,7 @@ return null; } ObjectReferenceImpl object = null;

@@ -1313,7 +1313,7 @@ // Handle any queue elements that are not strongly reachable processQueue();

-------------- next part -------------- diff -r d02b062bc827 src/share/classes/com/sun/security/auth/SolarisNumericGroupPrincipal.java --- a/src/share/classes/com/sun/security/auth/SolarisNumericGroupPrincipal.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/security/auth/SolarisNumericGroupPrincipal.java Fri Jun 20 09:57:16 2014 -0300 @@ -110,7 +110,7 @@ * */ public SolarisNumericGroupPrincipal(long name, boolean primaryGroup) {

@@ -137,7 +137,7 @@ * SolarisNumericGroupPrincipal as a long. */ public long longValue() {

diff -r d02b062bc827 src/share/classes/com/sun/security/auth/SolarisNumericUserPrincipal.java --- a/src/share/classes/com/sun/security/auth/SolarisNumericUserPrincipal.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/security/auth/SolarisNumericUserPrincipal.java Fri Jun 20 09:57:16 2014 -0300 @@ -96,7 +96,7 @@ * represented as a long. */ public SolarisNumericUserPrincipal(long name) {

@@ -122,7 +122,7 @@ * SolarisNumericUserPrincipal as a long. */ public long longValue() {

diff -r d02b062bc827 src/share/classes/com/sun/security/auth/UnixNumericGroupPrincipal.java --- a/src/share/classes/com/sun/security/auth/UnixNumericGroupPrincipal.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/security/auth/UnixNumericGroupPrincipal.java Fri Jun 20 09:57:16 2014 -0300 @@ -102,7 +102,7 @@ * */ public UnixNumericGroupPrincipal(long name, boolean primaryGroup) {

@@ -129,7 +129,7 @@ * UnixNumericGroupPrincipal as a long. */ public long longValue() {

diff -r d02b062bc827 src/share/classes/com/sun/security/auth/UnixNumericUserPrincipal.java --- a/src/share/classes/com/sun/security/auth/UnixNumericUserPrincipal.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/security/auth/UnixNumericUserPrincipal.java Fri Jun 20 09:57:16 2014 -0300 @@ -87,7 +87,7 @@ * represented as a long. */ public UnixNumericUserPrincipal(long name) {

@@ -113,7 +113,7 @@ * UnixNumericUserPrincipal as a long. */ public long longValue() {

diff -r d02b062bc827 src/share/classes/com/sun/security/sasl/digest/DigestMD5Base.java --- a/src/share/classes/com/sun/security/sasl/digest/DigestMD5Base.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/security/sasl/digest/DigestMD5Base.java Fri Jun 20 09:57:16 2014 -0300 @@ -1410,7 +1410,7 @@ if (logger.isLoggable(Level.FINEST)) { logger.log(Level.FINEST, "DIGEST33:Expecting sequence num: {0}",

@@ -1460,7 +1460,7 @@ if (logger.isLoggable(Level.INFO)) { logger.log(Level.INFO, "DIGEST39:Incorrect padding: {0}",

diff -r d02b062bc827 src/share/classes/com/sun/security/sasl/digest/DigestMD5Client.java --- a/src/share/classes/com/sun/security/sasl/digest/DigestMD5Client.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/security/sasl/digest/DigestMD5Client.java Fri Jun 20 09:57:16 2014 -0300 @@ -439,7 +439,7 @@

     if (logger.isLoggable(Level.FINE)) {
         logger.log(Level.FINE, "DIGEST61:Raw send size: {0}",

diff -r d02b062bc827 src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Client.java --- a/src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Client.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Client.java Fri Jun 20 09:57:16 2014 -0300 @@ -241,7 +241,7 @@ "KRB5CLNT05:Challenge [unwrapped]:", gssOutToken); } logger.log(Level.FINE, "KRB5CLNT06:Server protections: {0}",

@@ -275,9 +275,8 @@ if (logger.isLoggable(Level.FINE)) { logger.log(Level.FINE, "KRB5CLNT07:Client max recv size: {0}; server max recv size: {1}; rawSendSize: {2}",

@@ -293,7 +292,7 @@ if (logger.isLoggable(Level.FINE)) { logger.log(Level.FINE, "KRB5CLNT08:Selected protection: {0}; privacy: {1}; integrity: {2}",

diff -r d02b062bc827 src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Server.java --- a/src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Server.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Server.java Fri Jun 20 09:57:16 2014 -0300 @@ -221,8 +221,7 @@ if (logger.isLoggable(Level.FINE)) { logger.log(Level.FINE, "KRB5SRV06:Supported protections: {0}; recv max buf size: {1}",

@@ -288,14 +287,12 @@ if (logger.isLoggable(Level.FINE)) { logger.log(Level.FINE, "KRB5SRV10:Selected protection: {0}; privacy: {1}; integrity: {2}",

"KRB5SRV11:Client max recv size: {0}; server max send size: {1}; rawSendSize: {2}",

diff -r d02b062bc827 src/share/classes/com/sun/security/sasl/util/AbstractSaslImpl.java --- a/src/share/classes/com/sun/security/sasl/util/AbstractSaslImpl.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/security/sasl/util/AbstractSaslImpl.java Fri Jun 20 09:57:16 2014 -0300 @@ -77,7 +77,7 @@

         if (logger.isLoggable(Level.FINE)) {
             logger.logp(Level.FINE, myClassName, "constructor",

@@ -286,7 +286,7 @@

         // Message id supplied by caller as part of traceTag
         logger.logp(lev, srcClass, srcMethod, "{0} ( {1} ): {2}",

-------------- next part -------------- diff -r d02b062bc827 src/share/classes/com/sun/jndi/ldap/Connection.java --- a/src/share/classes/com/sun/jndi/ldap/Connection.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/jndi/ldap/Connection.java Fri Jun 20 09:57:15 2014 -0300 @@ -249,7 +249,7 @@ String.class, int.class});

         return inetSocketAddressCons.newInstance(new Object[]{

@@ -309,7 +309,7 @@

                 // connected socket
                 connect.invoke(socket, new Object[]{

@@ -326,7 +326,7 @@ } // connected socket socket = (Socket) createSocket.invoke(factory,

@@ -348,7 +348,7 @@ "a timeout"); } connect.invoke(socket, new Object[]{

diff -r d02b062bc827 src/share/classes/com/sun/jndi/ldap/LdapPoolManager.java --- a/src/share/classes/com/sun/jndi/ldap/LdapPoolManager.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/jndi/ldap/LdapPoolManager.java Fri Jun 20 09:57:15 2014 -0300 @@ -406,7 +406,7 @@ try { return Integer.getInteger(propName, defVal); } catch (SecurityException e) {

@@ -421,7 +421,7 @@ try { return Long.getLong(propName, defVal); } catch (SecurityException e) {

diff -r d02b062bc827 src/share/classes/com/sun/jndi/ldap/NamingEventNotifier.java --- a/src/share/classes/com/sun/jndi/ldap/NamingEventNotifier.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/jndi/ldap/NamingEventNotifier.java Fri Jun 20 09:57:15 2014 -0300 @@ -221,7 +221,7 @@ return;

     NamingEvent e = new NamingEvent(eventSrc, NamingEvent.OBJECT_ADDED,

@@ -233,7 +233,7 @@ return;

     NamingEvent e = new NamingEvent(eventSrc, NamingEvent.OBJECT_REMOVED,

@@ -248,7 +248,7 @@ Binding oldBd = new Binding(newBd.getName(), null, newBd.isRelative());

     NamingEvent e = new NamingEvent(

@@ -273,7 +273,7 @@ }

     NamingEvent e = new NamingEvent(

diff -r d02b062bc827 src/share/classes/com/sun/jndi/toolkit/dir/SearchFilter.java --- a/src/share/classes/com/sun/jndi/toolkit/dir/SearchFilter.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/jndi/toolkit/dir/SearchFilter.java Fri Jun 20 09:57:15 2014 -0300 @@ -379,7 +379,7 @@ // used for substring comparisons (where proto has "" wildcards private boolean substringMatch(String proto, String value) { // simple case 1: "" means attribute presence is being tested

-------------- next part -------------- diff -r d02b062bc827 src/share/classes/com/sun/jmx/snmp/EnumRowStatus.java --- a/src/share/classes/com/sun/jmx/snmp/EnumRowStatus.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/jmx/snmp/EnumRowStatus.java Fri Jun 20 09:57:15 2014 -0300 @@ -284,20 +284,20 @@ final static Hashtable<Integer, String> intTable = new Hashtable<>(); final static Hashtable<String, Integer> stringTable = new Hashtable<>(); static {

diff -r d02b062bc827 src/share/classes/com/sun/jmx/snmp/Enumerated.java --- a/src/share/classes/com/sun/jmx/snmp/Enumerated.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/jmx/snmp/Enumerated.java Fri Jun 20 09:57:15 2014 -0300 @@ -71,7 +71,7 @@ * the method is illegal or inappropriate. */ public Enumerated(int valueIndex) throws IllegalArgumentException {

}

diff -r d02b062bc827 src/share/classes/com/sun/jmx/snmp/IPAcl/JJTParserState.java --- a/src/share/classes/com/sun/jmx/snmp/IPAcl/JJTParserState.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/jmx/snmp/IPAcl/JJTParserState.java Fri Jun 20 09:57:15 2014 -0300 @@ -100,7 +100,7 @@

void openNodeScope(Node n) {

@@ -100,7 +100,7 @@ * @return The Integer representation of the value. */ public Integer toInteger() {

diff -r d02b062bc827 src/share/classes/com/sun/jmx/snmp/SnmpInt.java --- a/src/share/classes/com/sun/jmx/snmp/SnmpInt.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/jmx/snmp/SnmpInt.java Fri Jun 20 09:57:15 2014 -0300 @@ -130,7 +130,7 @@ * @return The Long representation of the value. */ public Long toLong() {

@@ -146,7 +146,7 @@ * @return The Integer representation of the value. */ public Integer toInteger() {

diff -r d02b062bc827 src/share/classes/com/sun/jmx/snmp/SnmpString.java --- a/src/share/classes/com/sun/jmx/snmp/SnmpString.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/jmx/snmp/SnmpString.java Fri Jun 20 09:57:15 2014 -0300 @@ -140,7 +140,7 @@ public Byte[] toByte() { Byte[] result = new Byte[value.length] ; for (int i = 0 ; i < value.length ; i++) {

@@ -260,7 +260,7 @@ * */ void registerNestedArc(long arc) {

diff -r d02b062bc827 src/share/classes/com/sun/jmx/snmp/daemon/CommunicatorServer.java --- a/src/share/classes/com/sun/jmx/snmp/daemon/CommunicatorServer.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/jmx/snmp/daemon/CommunicatorServer.java Fri Jun 20 09:57:15 2014 -0300 @@ -1272,8 +1272,8 @@ message, // message "State", // attribute name "int", // attribute type

diff -r d02b062bc827 src/share/classes/com/sun/jmx/snmp/daemon/SnmpAdaptorServer.java --- a/src/share/classes/com/sun/jmx/snmp/daemon/SnmpAdaptorServer.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/jmx/snmp/daemon/SnmpAdaptorServer.java Fri Jun 20 09:57:15 2014 -0300 @@ -569,7 +569,7 @@ */ @Override public Integer getTrapPort() {

@@ -639,7 +639,7 @@ */ @Override public Integer getBufferSize() {

@@ -858,7 +858,7 @@ */ @Override public Long getSnmpOutTraps() {

@@ -868,7 +868,7 @@ */ @Override public Long getSnmpOutGetResponses() {

@@ -878,7 +878,7 @@ */ @Override public Long getSnmpOutGenErrs() {

@@ -888,7 +888,7 @@ */ @Override public Long getSnmpOutBadValues() {

@@ -898,7 +898,7 @@ */ @Override public Long getSnmpOutNoSuchNames() {

@@ -908,7 +908,7 @@ */ @Override public Long getSnmpOutTooBigs() {

@@ -918,7 +918,7 @@ */ @Override public Long getSnmpInASNParseErrs() {

@@ -928,7 +928,7 @@ */ @Override public Long getSnmpInBadCommunityUses() {

@@ -939,7 +939,7 @@ */ @Override public Long getSnmpInBadCommunityNames() {

@@ -949,7 +949,7 @@ */ @Override public Long getSnmpInBadVersions() {

@@ -959,7 +959,7 @@ */ @Override public Long getSnmpOutPkts() {

@@ -969,7 +969,7 @@ */ @Override public Long getSnmpInPkts() {

@@ -979,7 +979,7 @@ */ @Override public Long getSnmpInGetRequests() {

@@ -989,7 +989,7 @@ */ @Override public Long getSnmpInGetNexts() {

@@ -999,7 +999,7 @@ */ @Override public Long getSnmpInSetRequests() {

@@ -1009,7 +1009,7 @@ */ @Override public Long getSnmpInTotalSetVars() {

@@ -1019,7 +1019,7 @@ */ @Override public Long getSnmpInTotalReqVars() {

@@ -1032,7 +1032,7 @@ */ @Override public Long getSnmpSilentDrops() {

@@ -1045,7 +1045,7 @@ */ @Override public Long getSnmpProxyDrops() {

diff -r d02b062bc827 src/share/classes/com/sun/jmx/snmp/internal/SnmpLcd.java --- a/src/share/classes/com/sun/jmx/snmp/internal/SnmpLcd.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/jmx/snmp/internal/SnmpLcd.java Fri Jun 20 09:57:15 2014 -0300 @@ -43,15 +43,15 @@

     public void addModelLcd(int id,
                             SnmpModelLcd usmlcd) {

-------------- next part -------------- diff -r d02b062bc827 src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java --- a/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java Fri Jun 20 09:57:15 2014 -0300 @@ -812,12 +812,12 @@

         "OptionPane.setButtonMargin", Boolean.FALSE,
         "OptionPane.sameSizeButtons", Boolean.TRUE,

diff -r d02b062bc827 src/share/classes/com/sun/java/swing/plaf/motif/MotifLookAndFeel.java --- a/src/share/classes/com/sun/java/swing/plaf/motif/MotifLookAndFeel.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/java/swing/plaf/motif/MotifLookAndFeel.java Fri Jun 20 09:57:15 2014 -0300 @@ -567,7 +567,7 @@ "ProgressBar.selectionForeground", table.get("control"), "ProgressBar.selectionBackground", table.get("controlText"), "ProgressBar.border", loweredBevelBorder,

@@ -582,7 +582,7 @@ "released SPACE", "released" }),

@@ -593,7 +593,7 @@ }),

         "RadioButton.margin", new InsetsUIResource(4, 2, 4, 2),

@@ -627,10 +627,10 @@ "Menu.selectionBackground", menuItemPressedBackground, "Menu.checkIcon", menuItemCheckIcon, "Menu.arrowIcon", menuArrowIcon,

@@ -938,7 +938,7 @@ "Tree.collapsedIcon", treeCollapsedIcon, "Tree.editorBorder", focusBorder, "Tree.editorBorderSelectionColor", table.get("activeCaptionBorder"),

diff -r d02b062bc827 src/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java --- a/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java Fri Jun 20 09:57:15 2014 -0300 @@ -1102,8 +1102,7 @@ "PasswordField.selectionBackground", SelectionBackgroundColor, "PasswordField.selectionForeground", SelectionTextColor, "PasswordField.caretForeground",WindowTextColor,

-------------- next part -------------- diff -r d02b062bc827 src/share/classes/com/sun/imageio/plugins/bmp/BMPMetadata.java --- a/src/share/classes/com/sun/imageio/plugins/bmp/BMPMetadata.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/imageio/plugins/bmp/BMPMetadata.java Fri Jun 20 09:57:15 2014 -0300 @@ -126,18 +126,18 @@ new IIOMetadataNode(nativeMetadataFormatName);

     addChildNode(root, "BMPVersion", bmpVersion);

@@ -146,19 +146,19 @@

     if (version >= 4) {
         node = addChildNode(root, "Mask", null);

@@ -172,12 +172,12 @@ red = palette[j++] & 0xff; green = palette[j++] & 0xff; blue = palette[j++] & 0xff;

diff -r d02b062bc827 src/share/classes/com/sun/imageio/plugins/gif/GIFImageReader.java --- a/src/share/classes/com/sun/imageio/plugins/gif/GIFImageReader.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/imageio/plugins/gif/GIFImageReader.java Fri Jun 20 09:57:15 2014 -0300 @@ -616,7 +616,7 @@ return index; }

diff -r d02b062bc827 src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java --- a/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java Fri Jun 20 09:57:15 2014 -0300 @@ -367,10 +367,10 @@ // Now we are at the first image if there are any, so add it // to the list if (hasNextImage()) {

@@ -498,7 +498,7 @@ if (!hasNextImage()) { throw new IndexOutOfBoundsException(); }

diff -r d02b062bc827 src/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadata.java --- a/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadata.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadata.java Fri Jun 20 09:57:15 2014 -0300 @@ -2323,7 +2323,7 @@ SOSMarkerSegment sos = (SOSMarkerSegment) seg; SOSMarkerSegment.ScanComponentSpec [] specs = sos.componentSpecs; for (int i = 0; i < specs.length; i++) {

diff -r d02b062bc827 src/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java --- a/src/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java Fri Jun 20 09:57:15 2014 -0300 @@ -639,7 +639,7 @@ metadata.zTXt_keyword.add(keyword);

     int method = stream.readUnsignedByte();

diff -r d02b062bc827 src/share/classes/com/sun/imageio/plugins/png/PNGMetadata.java --- a/src/share/classes/com/sun/imageio/plugins/png/PNGMetadata.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/imageio/plugins/png/PNGMetadata.java Fri Jun 20 09:57:15 2014 -0300 @@ -1644,7 +1644,7 @@ int compressionMethod = getEnumeratedAttribute(zTXt_node, "compressionMethod", zTXt_compressionMethodNames);

diff -r d02b062bc827 src/share/classes/com/sun/imageio/plugins/wbmp/WBMPMetadata.java --- a/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPMetadata.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPMetadata.java Fri Jun 20 09:57:15 2014 -0300 @@ -75,9 +75,9 @@ IIOMetadataNode root = new IIOMetadataNode(nativeMetadataFormatName);



More information about the core-libs-dev mailing list