Mercurial > jdk8-mips64-public > corba / changeset

     1.1 --- a/.hgtags	Mon May 19 21:34:38 2014 -0700
     1.2 +++ b/.hgtags	Thu May 29 10:51:17 2014 -0700
     1.3 @@ -245,7 +245,9 @@
     1.4  a7d3638deb2f4e33217b1ecf889479e90f9e5b50 jdk8-b121
     1.5  0cd687347540b1d14e9cc653ba6af5f6807eb379 jdk8-b122
     1.6  1ecd4619f60c2432120821e805e64bdb45de66cc jdk8-b123
     1.7 +afecd2878aee29c2d0282d2c6b3ba56e91b0b2de jdk8u20-b00
     1.8  7b45151c7a05764b87ca088ba70448d39de6d41f jdk8-b124
     1.9 +7547c6a90a9e06b11ec1dca943b30c09c1665aa8 jdk8u20-b01
    1.10  7b45151c7a05764b87ca088ba70448d39de6d41f jdk8-b125
    1.11  8ceb68fd9e107767edf949c6b3ac9d425ca93cac jdk8-b126
    1.12  b8c71dae05574f8eca7ca6d703b16b450850b033 jdk8-b127
    1.13 @@ -277,4 +279,23 @@
    1.14  3052e1208958022173a6bf752edb88c7ad188797 jdk8u11-b07
    1.15  fff1b1687ed60d3d398b3d55c0dc71ee3450a601 jdk8u11-b08
    1.16  f846c0c1c330545b8a85fc05a36fa95f48757525 jdk8u11-b09
    1.17 +3e4b895d06e8d292f7338aa2155849173722062f jdk8u11-b10
    1.18 +bfafb13aac1c8b2d9184d59ec510b45d965b7667 jdk8u20-b02
    1.19 +9059a1c857044ad5ce7564ddb71a064364f8fcf5 jdk8u20-b03
    1.20 +abe5b0157c367a72f9059269ca633ecfe15732d2 jdk8u20-b04
    1.21 +17d296953274eb110f284035ddb6c588f8b61823 jdk8u20-b05
    1.22 +0683ee308085785d0455f4153e764e062843f178 jdk8-b130
    1.23 +5e5c8f0c45dd75a08089586ca50835393f00c2cb jdk8-b131
    1.24 +84fed37bbe640666bfc022c2e8b9fde468de35d2 jdk8-b132
    1.25 +bcdc679d86aa752ccb62f6ecb182ff10ea09dce1 jdk8u20-b06
    1.26 +32b9c4f0ab3c6d33f70724b775cb9d12c004be6d jdk8u20-b07
    1.27 +4e4a75376185ca1a712cc9fef5a340e6927cf5e2 jdk8u20-b08
    1.28 +0344396d09b0e20d4a8d1bdff9f129250a60f365 jdk8u20-b09
    1.29 +e930c4fa31586b0f21887f7b50fba927550f17fb jdk8u20-b10
    1.30 +9a6092124c7c926d380a5f3b0f899fd1427c6e69 jdk8u20-b11
    1.31 +673829390271e51f8bc442ffbd4726833a7b1c06 jdk8u20-b12
    1.32 +d9985581e2a4973b48817103cd006f70863bc776 jdk8u20-b13
    1.33 +1680797c869e6e6df965c83a854fe7633ab94aa7 jdk8u20-b14
    1.34 +5949c13039299a0052343e81bb7da2e2068282fa jdk8u20-b15
    1.35 +db1b47c1102e31fe649e0ca13a85dc4f13281df4 jdk8u20-b16
    1.36  08aa9f55fe5bce1f04cfd2958f71e8df18643e29 jdk8u25-b00

     2.1 --- a/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_pt_BR.properties	Mon May 19 21:34:38 2014 -0700
     2.2 +++ b/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_pt_BR.properties	Thu May 29 10:51:17 2014 -0700
     2.3 @@ -1,5 +1,5 @@
     2.4  #
     2.5 -# Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
     2.6 +# Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
     2.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.8  #
     2.9  # This code is free software; you can redistribute it and/or modify it
    2.10 @@ -23,7 +23,7 @@
    2.11  # questions.
    2.12  #
    2.13  
    2.14 -orbd.usage=Uso: {0} <op\u00E7\u00F5es> \n\nem que <op\u00E7\u00F5es> inclui:\n  -port                  porta de ativa\u00E7\u00E3o na qual o ORBD deve ser iniciado, default 1049 (opcional)\n  -defaultdb             diret\u00F3rio dos arquivos ORBD, default "./orb.db" (opcional)\n  -serverid              id do servidor para ORBD, default 1 (opcional)\n  -ORBInitialPort        porta inicial (obrigat\u00F3rio)\n  -ORBInitialHost        nome de host inicial (obrigat\u00F3rio)\n
    2.15 +orbd.usage=Uso: {0} <op\u00E7\u00F5es> \n\nem que <op\u00E7\u00F5es> inclui:\n  -port                  porta de ativa\u00E7\u00E3o na qual o ORBD deve ser iniciado, padr\u00E3o 1049 (opcional)\n  -defaultdb             diret\u00F3rio dos arquivos ORBD, padr\u00E3o "./orb.db" (opcional)\n  -serverid              id do servidor para ORBD, padr\u00E3o 1 (opcional)\n  -ORBInitialPort        porta inicial (obrigat\u00F3rio)\n  -ORBInitialHost        nome de host inicial (obrigat\u00F3rio)\n
    2.16  
    2.17  servertool.usage=Uso: {0} <op\u00E7\u00F5es> \n\nem que <op\u00E7\u00F5es> inclui:\n  -ORBInitialPort        porta inicial (obrigat\u00F3rio)\n  -ORBInitialHost        nome de host inicial (obrigat\u00F3rio)\n
    2.18  servertool.banner=\n\nBem-vindo \u00E0 Ferramenta de Servidor IDL Java \ninsira os comandos no prompt \n

     3.1 --- a/src/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelAcceptorImpl.java	Mon May 19 21:34:38 2014 -0700
     3.2 +++ b/src/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelAcceptorImpl.java	Thu May 29 10:51:17 2014 -0700
     3.3 @@ -253,6 +253,13 @@
     3.4              // registered with the selector.  Otherwise if the bytes
     3.5              // are read on the connection it will attempt a time stamp
     3.6              // but the cache will be null, resulting in NPE.
     3.7 +
     3.8 +            // A connection needs to be timestamped before putting to the cache.
     3.9 +            // Otherwise the newly created connection (with 0 timestamp) could be
    3.10 +            // incorrectly reclaimed by concurrent reclaim() call OR if there
    3.11 +            // will be no events on this connection then it could be reclaimed
    3.12 +            // by upcoming reclaim() call.
    3.13 +            getConnectionCache().stampTime(connection);
    3.14              getConnectionCache().put(this, connection);
    3.15  
    3.16              if (connection.shouldRegisterServerReadEvent()) {