Skip to content
Permalink
Browse files

Fixed concurrency problem NAS-5098

  • Loading branch information...
csrster committed Jan 30, 2017
1 parent 3a464dc commit 95eaaeb7f82e27ba8e2e1aa8965fbd2ed6f9678f
12 pom.xml
@@ -27,6 +27,8 @@
<openwayback.version>2.0.0</openwayback.version>
<jwat.version>1.0.4</jwat.version>
<derby.version>10.12.1.1</derby.version>
<maven-release-plugin.version>2.5.2</maven-release-plugin.version>
<commons-lang3.version>3.4</commons-lang3.version>
</properties>

<modules>
@@ -316,6 +318,11 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons-lang3.version}</version>
</dependency>
<!--
<dependency>
<groupId>xerces</groupId>
@@ -374,7 +381,7 @@

<plugin>
<artifactId>maven-release-plugin</artifactId>
<version>2.5.2</version>
<version>${maven-release-plugin.version}</version>
</plugin>

<plugin>
@@ -523,8 +530,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>${maven-release-plugin.version}</version>
<configuration>
<autoversionsubmodules>true</autoversionsubmodules>
<autoVersionSubmodules>true</autoVersionSubmodules>
</configuration>
</plugin>
</plugins>
@@ -113,6 +113,10 @@
<groupId>org.apache.derby</groupId>
<artifactId>derbytools</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
</dependencies>

<build>
@@ -27,10 +27,10 @@
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.text.SimpleDateFormat;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import org.apache.commons.lang3.time.FastDateFormat;
import org.archive.wayback.UrlCanonicalizer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -48,8 +48,8 @@
/** Define SimpleDateFormat objects for the representation of timestamps in crawl logs and cdx files respectively. */
private static final String crawlDateFormatString = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
private static final String cdxDateFormatString = "yyyyMMddHHmmss";
private static final SimpleDateFormat crawlDateFormat = new SimpleDateFormat(crawlDateFormatString);
private static final SimpleDateFormat cdxDateFormat = new SimpleDateFormat(cdxDateFormatString);
private static final FastDateFormat crawlDateFormat = FastDateFormat.getInstance(crawlDateFormatString);
private static final FastDateFormat cdxDateFormat = FastDateFormat.getInstance(cdxDateFormatString);

/** Pattern representing the part of a crawl log entry describing a duplicate record. */
private static final String duplicateRecordPatternString = "duplicate:\"([^,]*),([^,]*)\",(.*)"; //e.g. duplicate:"arcfile,offset"

0 comments on commit 95eaaeb

Please sign in to comment.
You can’t perform that action at this time.