[openorb-commits] CVS: tools/src/main/org/openorb/util/service ServiceBase.java,1.37,1.38

[<lk...@us...>]

Update of /cvsroot/openorb/tools/src/main/org/openorb/util/service
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv914/src/main/org/openorb/util/service

Modified Files:
	ServiceBase.java 
Log Message:
Fixed potential NPE in ServiceBase

Index: ServiceBase.java
===================================================================
RCS file: /cvsroot/openorb/tools/src/main/org/openorb/util/service/ServiceBase.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- ServiceBase.java	22 Jul 2004 07:18:29 -0000	1.37
+++ ServiceBase.java	25 Oct 2004 12:25:25 -0000	1.38
@@ -791,7 +791,7 @@
     protected boolean bindToNamingService( String name, org.omg.CORBA.Object obj, ORB orb )
     {
         String long_name = getLongName();
-        boolean bNoNS = long_name.equals( NamingUtils.NS_NAME_LONG );
+        boolean bNoNS = NamingUtils.NS_NAME_LONG.equals( long_name );
         boolean bForcePrintIOR = false;
 
         try
@@ -847,7 +847,7 @@
     private void deregisterObjects()
     {
         String long_name = getLongName();
-        boolean bNoNS = long_name.equals( NamingUtils.NS_NAME_LONG );
+        boolean bNoNS = NamingUtils.NS_NAME_LONG.equals( long_name );
 
         Iterator iter = m_nameObjectMap.keySet().iterator();
         while ( iter.hasNext() )