[openorb-commits] CVS: tools/src/main/org/openorb/util MergeStack.java,1.4,1.5

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

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

Modified Files:
	MergeStack.java 
Log Message:
Fixed NPE in MergeStack

Index: MergeStack.java
===================================================================
RCS file: /cvsroot/openorb/tools/src/main/org/openorb/util/MergeStack.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- MergeStack.java	11 Feb 2004 12:20:50 -0000	1.4
+++ MergeStack.java	24 Feb 2005 07:43:33 -0000	1.5
@@ -427,7 +427,11 @@
             {
                 m_next = next;
             }
-            m_next.m_prev = this;
+
+            if ( m_next != null )
+            {
+                m_next.m_prev = this;
+            }
         }
     }