1.1 --- a/src/share/classes/com/sun/corba/se/impl/oa/toa/TOAFactory.java Thu Nov 17 10:51:17 2011 -0800 1.2 +++ b/src/share/classes/com/sun/corba/se/impl/oa/toa/TOAFactory.java Wed Mar 28 02:50:50 2012 -0700 1.3 @@ -1,5 +1,5 @@ 1.4 /* 1.5 - * Copyright (c) 2002, 2003, 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 @@ -78,8 +78,8 @@ 1.11 1.12 public void shutdown( boolean waitForCompletion ) 1.13 { 1.14 - if (Util.instance != null) { 1.15 - Util.instance.unregisterTargetsForORB(orb); 1.16 + if (Util.isInstanceDefined()) { 1.17 + Util.getInstance().unregisterTargetsForORB(orb); 1.18 } 1.19 } 1.20