You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2007/08/17 09:47:07 UTC
svn commit: r566959 - /maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java

Author: brett
Date: Fri Aug 17 00:47:06 2007
New Revision: 566959

URL: http://svn.apache.org/viewvc?view=rev&rev=566959
Log:
[MRM-436] configuration tests don't always set database scanning fields, so add some null guards

Modified:
    maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java

Modified: maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java?view=diff&rev=566959&r1=566958&r2=566959
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java Fri Aug 17 00:47:06 2007
@@ -268,17 +268,17 @@
 
     private String unescapeCronExpression( String cronExpression )
     {
-        return StringUtils.replace( cronExpression, "\\," , ","  );
+        return StringUtils.replace( cronExpression, "\\,", "," );
     }
 
     private String escapeCronExpression( String cronExpression )
     {
-        return StringUtils.replace( cronExpression, "," , "\\,"  );
+        return StringUtils.replace( cronExpression, ",", "\\," );
     }
 
-     private Configuration processExpressions( Configuration config )
+    private Configuration processExpressions( Configuration config )
     {
-         // TODO: for commons-configuration 1.3 only
+        // TODO: for commons-configuration 1.3 only
         for ( Iterator i = config.getRepositories().iterator(); i.hasNext(); )
         {
             RepositoryConfiguration c = (RepositoryConfiguration) i.next();
@@ -286,8 +286,12 @@
             c.setRefreshCronExpression( unescapeCronExpression( c.getRefreshCronExpression() ) );
         }
 
-        String cron = config.getDatabaseScanning().getCronExpression();
-        config.getDatabaseScanning().setCronExpression( unescapeCronExpression( cron ) );
+        DatabaseScanningConfiguration databaseScanning = config.getDatabaseScanning();
+        if ( databaseScanning != null )
+        {
+            String cron = databaseScanning.getCronExpression();
+            databaseScanning.setCronExpression( unescapeCronExpression( cron ) );
+        }
 
         return config;
     }
@@ -298,12 +302,15 @@
         {
             RepositoryConfiguration c = (RepositoryConfiguration) i.next();
 
-            c.setRefreshCronExpression(
-                    escapeCronExpression( c.getRefreshCronExpression() ) );
+            c.setRefreshCronExpression( escapeCronExpression( c.getRefreshCronExpression() ) );
         }
 
-        String cron = config.getDatabaseScanning().getCronExpression();
-        config.getDatabaseScanning().setCronExpression( escapeCronExpression( cron ) );
+        DatabaseScanningConfiguration databaseScanning = config.getDatabaseScanning();
+        if ( databaseScanning != null )
+        {
+            String cron = databaseScanning.getCronExpression();
+            databaseScanning.setCronExpression( escapeCronExpression( cron ) );
+        }
 
         return config;
     }