dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 12599
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2013-10-13 11:06:48 +0200
message:
  Minor
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/appmanager/App.java


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/appmanager/App.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/appmanager/App.java	2013-10-09 17:31:36 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/appmanager/App.java	2013-10-13 09:06:48 +0000
@@ -93,7 +93,12 @@
     @JsonProperty
     public String getLaunchUrl()
     {
-        return getBaseUrl() + File.separator + getFolderName() + File.separator + getLaunchPath();
+        if ( baseUrl != null && folderName != null && launchPath != null )
+        {
+            return baseUrl + File.separator + folderName + File.separator + launchPath;
+        }
+        
+        return null;
     }
     
     public String getVersion()