diff -r 66c7161ee588 -r e324dfb90c9e src/share/classes/com/sun/corba/se/impl/oa/toa/TOAFactory.java
--- a/src/share/classes/com/sun/corba/se/impl/oa/toa/TOAFactory.java	Thu Nov 17 10:51:17 2011 -0800
+++ b/src/share/classes/com/sun/corba/se/impl/oa/toa/TOAFactory.java	Wed Mar 28 02:50:50 2012 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2012, 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
@@ -78,8 +78,8 @@
 
     public void shutdown( boolean waitForCompletion )
     {
-        if (Util.instance != null) {
-            Util.instance.unregisterTargetsForORB(orb);
+        if (Util.isInstanceDefined()) {
+            Util.getInstance().unregisterTargetsForORB(orb);
         }
     }