You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@archiva.apache.org by ol...@apache.org on 2013/02/14 23:12:36 UTC

svn commit: r1446363 - /archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/PropertyEntry.java

Author: olamy
Date: Thu Feb 14 22:12:36 2013
New Revision: 1446363

URL: http://svn.apache.org/r1446363
Log:
prevent possible NPE

Modified:
    archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/PropertyEntry.java

Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/PropertyEntry.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/PropertyEntry.java?rev=1446363&r1=1446362&r2=1446363&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/PropertyEntry.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/PropertyEntry.java Thu Feb 14 22:12:36 2013
@@ -79,6 +79,10 @@ public class PropertyEntry
 
     public int compareTo( PropertyEntry o )
     {
+        if (o == null || o.getKey() == null)
+        {
+            return 1;
+        }
         return this.key.compareTo( o.getKey() );
     }
 }