You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2011/12/13 19:28:49 UTC

svn commit: r1213829 - /directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/SchemaSorter.java

Author: pamarcelot
Date: Tue Dec 13 18:28:48 2011
New Revision: 1213829

URL: http://svn.apache.org/viewvc?rev=1213829&view=rev
Log:
Fixed a NPE.

Modified:
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/SchemaSorter.java

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/SchemaSorter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/SchemaSorter.java?rev=1213829&r1=1213828&r2=1213829&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/SchemaSorter.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/SchemaSorter.java Tue Dec 13 18:28:48 2011
@@ -41,7 +41,10 @@ public class SchemaSorter implements Com
             Schema s1 = ( ( SchemaWrapper ) o1 ).getSchema();
             Schema s2 = ( ( SchemaWrapper ) o2 ).getSchema();
 
-            return s1.getSchemaName().compareToIgnoreCase( s2.getSchemaName() );
+            if ( ( s1 != null ) && ( s2 != null ) )
+            {
+                return s1.getSchemaName().compareToIgnoreCase( s2.getSchemaName() );
+            }
         }
 
         // Default