dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 146
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Thu 2009-04-02 16:23:50 +0200
message:
  dhis-support-external: made the LocationManager look for the system property before the environment variable
modified:
  dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/DefaultReportTableCreator.java
  dhis-2/dhis-support/dhis-support-external/src/main/java/org/hisp/dhis/external/location/DefaultLocationManager.java

=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/DefaultReportTableCreator.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/DefaultReportTableCreator.java	2009-04-02 12:32:16 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/DefaultReportTableCreator.java	2009-04-02 14:23:50 +0000
@@ -200,8 +200,6 @@
     public void deleteRelativePeriods()
     {
         dataMartStore.deleteRelativePeriods();
-        
-        log.info( "Deleted relative periods" );
     }
 
     // -------------------------------------------------------------------------

=== modified file 'dhis-2/dhis-support/dhis-support-external/src/main/java/org/hisp/dhis/external/location/DefaultLocationManager.java'
--- dhis-2/dhis-support/dhis-support-external/src/main/java/org/hisp/dhis/external/location/DefaultLocationManager.java	2009-04-02 11:32:07 +0000
+++ dhis-2/dhis-support/dhis-support-external/src/main/java/org/hisp/dhis/external/location/DefaultLocationManager.java	2009-04-02 14:23:50 +0000
@@ -72,11 +72,11 @@
 
     public void init()
     {
-        String path = System.getenv( environmentVariable );
+        String path = System.getProperty( systemProperty );
         
         if ( path != null )
         {
-            log.info( "Environment variable " + environmentVariable + " points to " + path );
+            log.info( "System property " + systemProperty + " points to " + path );
             
             if ( directoryIsValid( new File( path ) ) )
             {
@@ -85,13 +85,13 @@
         }
         else
         {
-            log.info( "Environment variable " + environmentVariable + " not set" );
+            log.info( "System property " + systemProperty + " not set" );
             
-            path = System.getProperty( systemProperty );
+            path = System.getenv( environmentVariable );
             
             if ( path != null )
             {
-                log.info( "System property " + systemProperty + " points to " + path );
+                log.info( "Environment variable " + environmentVariable + " points to " + path );
                 
                 if ( directoryIsValid( new File( path ) ) )
                 {
@@ -100,7 +100,7 @@
             }
             else
             {
-                log.info( "System proeprty " + systemProperty + " not set" );
+                log.info( "Environment variable " + environmentVariable + " not set" );
             }
         }
     }



--
Trunk
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.