Author: rdonkin
Date: Mon May 12 13:14:11 2008
New Revision: 655626
URL: http://svn.apache.org/viewvc?rev=655626&view=rev
Log:
Back out backport usage and opt for the traditionally way.
Modified:
james/server/trunk/build-tools/base-build.xml
james/server/trunk/phoenix-deployment/build.xml
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/James.java
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/ToMultiRepository.java
Modified: james/server/trunk/build-tools/base-build.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/build-tools/base-build.xml?rev=655626&r1=655625&r2=655626&view=diff
==============================================================================
--- james/server/trunk/build-tools/base-build.xml (original)
+++ james/server/trunk/build-tools/base-build.xml Mon May 12 13:14:11 2008
@@ -226,7 +226,6 @@
<include name="${jackrabbit-rmi.jar}"/>
<include name="${jcr.jar}"/>
<include name="${base-mailet.jar}"/>
- <include name="${backport-concurrent.jar}"/>
</fileset>
</path>
<path id='classpath.base.test'>
Modified: james/server/trunk/phoenix-deployment/build.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/build.xml?rev=655626&r1=655625&r2=655626&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/build.xml (original)
+++ james/server/trunk/phoenix-deployment/build.xml Mon May 12 13:14:11 2008
@@ -108,7 +108,6 @@
<include name="${jackrabbit-commons.jar}"/>
<include name="${jackrabbit-rmi.jar}"/>
<include name="${jcr.jar}"/>
- <include name="${backport-concurrent.jar}"/>
<!-- TODO: include libraries without wildcards -->
<include
name="${path.lib.james}/${jars-prefix}*-api-${version}.jar"/>
<include
name="${path.lib.james}/${jars-prefix}*-library-${version}.jar"/>
Modified:
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/James.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/James.java?rev=655626&r1=655625&r2=655626&view=diff
==============================================================================
---
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/James.java
(original)
+++
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/James.java
Mon May 12 13:14:11 2008
@@ -36,8 +36,6 @@
import org.apache.avalon.framework.service.Serviceable;
import org.apache.commons.collections.map.ReferenceMap;
-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicLong;
-
import org.apache.james.core.MailHeaders;
import org.apache.james.core.MailImpl;
import org.apache.james.core.MailetConfigImpl;
@@ -149,7 +147,8 @@
* The number of mails generated. Access needs to be synchronized for
* thread safety and to ensure that all threads see the latest value.
*/
- private final static AtomicLong count = new AtomicLong(1);
+ private static int count = 0;
+ private static final Object countLock = new Object();
/**
* The address of the postmaster for this server
@@ -612,7 +611,11 @@
* @see org.apache.james.services.MailServer#getId()
*/
public String getId() {
- long localCount = count.getAndIncrement();
+
+ final long localCount;
+ synchronized (countLock) {
+ localCount = count++;
+ }
StringBuffer idBuffer =
new StringBuffer(64)
.append("Mail")
Modified:
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/ToMultiRepository.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/ToMultiRepository.java?rev=655626&r1=655625&r2=655626&view=diff
==============================================================================
---
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/ToMultiRepository.java
(original)
+++
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/ToMultiRepository.java
Mon May 12 13:14:11 2008
@@ -34,8 +34,6 @@
import org.apache.mailet.MailAddress;
import org.apache.mailet.RFC2822Headers;
-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicLong;
-
import javax.mail.Header;
import javax.mail.MessagingException;
import javax.mail.internet.InternetHeaders;
@@ -75,7 +73,8 @@
* The number of mails generated. Access needs to be synchronized for
thread
* safety and to ensure that all threads see the latest value.
*/
- private final static AtomicLong count = new AtomicLong(1);
+ private static int count = 0;
+ private static final Object countLock = new Object();
/**
* The mailserver reference
@@ -248,7 +247,10 @@
* @return a new mail id
*/
public String getId() {
- final long localCount = count.getAndIncrement();
+ final long localCount;
+ synchronized (countLock) {
+ localCount = count++;
+ }
StringBuffer idBuffer = new StringBuffer(64).append("Mail").append(
System.currentTimeMillis()).append("-").append(localCount).append('L');
return idBuffer.toString();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
