Mercurial > jdk8-mips64-public > corba / changeset

     1.1 --- a/.hgtags	Mon Jun 15 11:38:11 2015 -0700
     1.2 +++ b/.hgtags	Wed Jun 17 23:21:50 2015 -0700
     1.3 @@ -442,6 +442,7 @@
     1.4  7ef66778231f234b69515202b2dc2287143ecb49 jdk8u60-b17
     1.5  cf83b578af1935db8474d01b8642e4803a534d3a jdk8u60-b18
     1.6  eb0caffe34c6bea2ff40966757142b3dcd3a2a4c jdk8u60-b19
     1.7 +4f3a29adbf4cfa2127e1108d82aaaa0d29f3c583 jdk8u60-b20
     1.8  8e247b5216a5a4623c1bef7331585d78e7c0fb15 jdk8u52-b06
     1.9  974e2fd9b5b3cec38cceb35c93bcc3b5bedbe91c jdk8u52-b07
    1.10  8e247b5216a5a4623c1bef7331585d78e7c0fb15 jdk8u65-b00

     2.1 --- a/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_sv.properties	Mon Jun 15 11:38:11 2015 -0700
     2.2 +++ b/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_sv.properties	Wed Jun 17 23:21:50 2015 -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, 2015, 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 @@ -100,7 +100,7 @@
    2.11  tnameserv.orbinitialport0=ORBInitialPort 0 \u00E4r inte ett giltigt alternativ f\u00F6r NameService
    2.12  tnameserv.hs1=Ursprunglig namngivningskontext:\n{0}
    2.13  tnameserv.hs2=TransientNameServer: st\u00E4ller in port f\u00F6r ursprungliga objektreferenser till: {0}
    2.14 -tnameserv.hs3=Redo.
    2.15 +tnameserv.hs3=Klar.
    2.16  
    2.17  orbd.commfailure=\nKunde inte starta ORBD eftersom ORBinitialport redan anv\u00E4nds
    2.18  orbd.internalexception=\nKunde inte starta ORBD p\u00E5 grund av internt undantag. \nM\u00F6jliga orsaker: \n1. Angivet ORBInitialPort eller ORBActivationPort anv\u00E4ndas redan \n2. Ingen beh\u00F6righet att skriva till orb.db