From: Olivier Lamy <olamy@apache.org>
Date: Thu, 15 Mar 2012 23:52:34 +0000 (+0000)
Subject: fix artifact description not returned
X-Git-Tag: archiva-1.4-M3~1028
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f00878ddf9df0d444e66aa268f7cc59139019d4c;p=archiva.git

fix artifact description not returned

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1301278 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
index c98fdab69..7f45c7005 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
@@ -207,7 +207,6 @@ public class DefaultBrowseService
 
             Collections.sort( sortedVersions, VersionComparator.getInstance() );
 
-
             return sortedVersions;
         }
         finally
@@ -300,7 +299,9 @@ public class DefaultBrowseService
                     if ( sharedModel.getDescription() != null && !StringUtils.equalsIgnoreCase(
                         sharedModel.getDescription(), versionMetadata.getDescription() ) )
                     {
-                        sharedModel.setDescription( null );
+                        sharedModel.setDescription( StringUtils.isNotEmpty( versionMetadata.getDescription() )
+                                                        ? versionMetadata.getDescription()
+                                                        : "" );
                     }
 
                     if ( sharedModel.getIssueManagement() != null && versionMetadata.getIssueManagement() != null