Mercurial > hg > shenandoah-preopenjdk-archive > openjdk8 > corba

changeset 732:9ac8f2724452

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author asaha
date Thu, 29 May 2014 10:51:17 -0700
parents c7161655fa4a (current diff) c98d012bb183 (diff)
children 31f50e3c0dcb
files .hgtags
diffstat 3 files changed, 30 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon May 19 21:34:38 2014 -0700
+++ b/.hgtags	Thu May 29 10:51:17 2014 -0700
@@ -245,7 +245,9 @@
 a7d3638deb2f4e33217b1ecf889479e90f9e5b50 jdk8-b121
 0cd687347540b1d14e9cc653ba6af5f6807eb379 jdk8-b122
 1ecd4619f60c2432120821e805e64bdb45de66cc jdk8-b123
+afecd2878aee29c2d0282d2c6b3ba56e91b0b2de jdk8u20-b00
 7b45151c7a05764b87ca088ba70448d39de6d41f jdk8-b124
+7547c6a90a9e06b11ec1dca943b30c09c1665aa8 jdk8u20-b01
 7b45151c7a05764b87ca088ba70448d39de6d41f jdk8-b125
 8ceb68fd9e107767edf949c6b3ac9d425ca93cac jdk8-b126
 b8c71dae05574f8eca7ca6d703b16b450850b033 jdk8-b127
@@ -277,4 +279,23 @@
 3052e1208958022173a6bf752edb88c7ad188797 jdk8u11-b07
 fff1b1687ed60d3d398b3d55c0dc71ee3450a601 jdk8u11-b08
 f846c0c1c330545b8a85fc05a36fa95f48757525 jdk8u11-b09
+3e4b895d06e8d292f7338aa2155849173722062f jdk8u11-b10
+bfafb13aac1c8b2d9184d59ec510b45d965b7667 jdk8u20-b02
+9059a1c857044ad5ce7564ddb71a064364f8fcf5 jdk8u20-b03
+abe5b0157c367a72f9059269ca633ecfe15732d2 jdk8u20-b04
+17d296953274eb110f284035ddb6c588f8b61823 jdk8u20-b05
+0683ee308085785d0455f4153e764e062843f178 jdk8-b130
+5e5c8f0c45dd75a08089586ca50835393f00c2cb jdk8-b131
+84fed37bbe640666bfc022c2e8b9fde468de35d2 jdk8-b132
+bcdc679d86aa752ccb62f6ecb182ff10ea09dce1 jdk8u20-b06
+32b9c4f0ab3c6d33f70724b775cb9d12c004be6d jdk8u20-b07
+4e4a75376185ca1a712cc9fef5a340e6927cf5e2 jdk8u20-b08
+0344396d09b0e20d4a8d1bdff9f129250a60f365 jdk8u20-b09
+e930c4fa31586b0f21887f7b50fba927550f17fb jdk8u20-b10
+9a6092124c7c926d380a5f3b0f899fd1427c6e69 jdk8u20-b11
+673829390271e51f8bc442ffbd4726833a7b1c06 jdk8u20-b12
+d9985581e2a4973b48817103cd006f70863bc776 jdk8u20-b13
+1680797c869e6e6df965c83a854fe7633ab94aa7 jdk8u20-b14
+5949c13039299a0052343e81bb7da2e2068282fa jdk8u20-b15
+db1b47c1102e31fe649e0ca13a85dc4f13281df4 jdk8u20-b16
 08aa9f55fe5bce1f04cfd2958f71e8df18643e29 jdk8u25-b00
--- a/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_pt_BR.properties	Mon May 19 21:34:38 2014 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_pt_BR.properties	Thu May 29 10:51:17 2014 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 # questions.
 #
 
-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
+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
 
 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
 servertool.banner=\n\nBem-vindo \u00E0 Ferramenta de Servidor IDL Java \ninsira os comandos no prompt \n
--- a/src/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelAcceptorImpl.java	Mon May 19 21:34:38 2014 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelAcceptorImpl.java	Thu May 29 10:51:17 2014 -0700
@@ -253,6 +253,13 @@
             // registered with the selector.  Otherwise if the bytes
             // are read on the connection it will attempt a time stamp
             // but the cache will be null, resulting in NPE.
+
+            // A connection needs to be timestamped before putting to the cache.
+            // Otherwise the newly created connection (with 0 timestamp) could be
+            // incorrectly reclaimed by concurrent reclaim() call OR if there
+            // will be no events on this connection then it could be reclaimed
+            // by upcoming reclaim() call.
+            getConnectionCache().stampTime(connection);
             getConnectionCache().put(this, connection);
 
             if (connection.shouldRegisterServerReadEvent()) {