Mercurial > jdk8-mips64-public > corba / file diff

     1.1 --- a/src/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorBase_R.java	Thu Nov 17 10:51:17 2011 -0800
     1.2 +++ b/src/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorBase_R.java	Wed Mar 28 02:50:50 2012 -0700
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -93,7 +93,7 @@
    1.11  
    1.12          activeObjectMap.putServant( servant, entry ) ;
    1.13  
    1.14 -        if (Util.instance != null) {
    1.15 +        if (Util.isInstanceDefined()) {
    1.16              POAManagerImpl pm = (POAManagerImpl)poa.the_POAManager() ;
    1.17              POAFactory factory = pm.getFactory() ;
    1.18              factory.registerPOAForServant(poa, servant);
    1.19 @@ -129,7 +129,7 @@
    1.20  
    1.21          activeObjectMap.remove(key);
    1.22  
    1.23 -        if (Util.instance != null) {
    1.24 +        if (Util.isInstanceDefined()) {
    1.25              POAManagerImpl pm = (POAManagerImpl)poa.the_POAManager() ;
    1.26              POAFactory factory = pm.getFactory() ;
    1.27              factory.unregisterPOAForServant(poa, s);