# HG changeset patch
# User Matthias Bläsing <matthias42@netbeans.org>
# Date 1330115969 -3600
# Branch dbfixes
# Node ID 5139ba7556508b72ec767c8fe7c4f3c41ad541a2
# Parent  fb1c94d7a63fb71f074beea4beb248bce384388f
Rework SchemaComparator to tollerate Nodes with a NULL-DisplayName (see bug #201380) for a reasoning

diff --git a/db/src/org/netbeans/modules/db/explorer/node/SchemaNodeProvider.java b/db/src/org/netbeans/modules/db/explorer/node/SchemaNodeProvider.java
--- a/db/src/org/netbeans/modules/db/explorer/node/SchemaNodeProvider.java
+++ b/db/src/org/netbeans/modules/db/explorer/node/SchemaNodeProvider.java
@@ -150,9 +150,15 @@
 
         @Override
         public int compare(Node node1, Node node2) {
-            assert node1.getDisplayName() != null : node1 + " has display name.";
-            assert node2.getDisplayName() != null : node2 + " has display name.";
-            return node1.getDisplayName().compareToIgnoreCase(node2.getDisplayName());
+            String d1 = node1.getDisplayName();
+            String d2 = node2.getDisplayName();
+            if(d1 == null) {
+                d1 = "";
+            }
+            if(d2 == null) {
+                d2 = "";
+            }
+            return d1.compareToIgnoreCase(d2);
         }
 
     }