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 2012/06/27 10:27:08 UTC
svn commit: r1354367 -
/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/runtime/ArchivaRuntimeInfo.java
Author: olamy
Date: Wed Jun 27 08:27:08 2012
New Revision: 1354367
URL: http://svn.apache.org/viewvc?rev=1354367&view=rev
Log:
not fail when timestamp has a bad format
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/runtime/ArchivaRuntimeInfo.java
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/runtime/ArchivaRuntimeInfo.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/runtime/ArchivaRuntimeInfo.java?rev=1354367&r1=1354366&r2=1354367&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/runtime/ArchivaRuntimeInfo.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/runtime/ArchivaRuntimeInfo.java Wed Jun 27 08:27:08 2012
@@ -23,6 +23,7 @@ import org.springframework.stereotype.Se
import javax.inject.Inject;
import javax.inject.Named;
+import java.util.Date;
import java.util.Properties;
/**
@@ -47,7 +48,15 @@ public class ArchivaRuntimeInfo
{
this.version = (String) archivaRuntimeProperties.get( "archiva.version" );
this.buildNumber = (String) archivaRuntimeProperties.get( "archiva.buildNumber" );
- this.timestamp = NumberUtils.createLong( (String) archivaRuntimeProperties.get( "archiva.timestamp" ) );
+ String archivaTimeStamp = (String) archivaRuntimeProperties.get( "archiva.timestamp" );
+ if ( NumberUtils.isNumber( archivaTimeStamp ) )
+ {
+ this.timestamp = NumberUtils.createLong( archivaTimeStamp );
+ }
+ else
+ {
+ this.timestamp = new Date().getTime();
+ }
this.devMode = Boolean.getBoolean( "archiva.devMode" );
}