You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ja...@apache.org on 2008/09/19 03:29:22 UTC
svn commit: r696893 - in
/maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/deploy:
DeploymentTarget.java FilePutExchange.java
Author: janb
Date: Thu Sep 18 18:29:22 2008
New Revision: 696893
URL: http://svn.apache.org/viewvc?rev=696893&view=rev
Log:
Do not always expect stream verifiers to be present.
Modified:
maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DeploymentTarget.java
maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/FilePutExchange.java
Modified: maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DeploymentTarget.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DeploymentTarget.java?rev=696893&r1=696892&r2=696893&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DeploymentTarget.java (original)
+++ maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DeploymentTarget.java Thu Sep 18 18:29:22 2008
@@ -36,9 +36,12 @@
import org.apache.maven.mercury.transport.api.Binding;
import org.apache.maven.mercury.transport.api.Server;
import org.mortbay.jetty.client.HttpClient;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public abstract class DeploymentTarget
-{
+{
+ private static final Logger log = LoggerFactory.getLogger(DeploymentTarget.class);
protected Server _server;
protected HttpClient _httpClient;
protected String _batchId;
@@ -154,6 +157,8 @@
}
_targetState = new TargetState();
_checksumState = new TargetState();
+ if (_verifiers.isEmpty())
+ _checksumState.ready();
}
public Binding getBinding()
@@ -169,6 +174,10 @@
private synchronized void updateState( Throwable t )
{
+ if (log.isDebugEnabled())
+ {
+ log.debug("updateState: exception="+t+" targetState="+_targetState.getState()+" checksumState="+_checksumState.getState()+" verifiers="+_verifiers.size()+" checksumsdeployed="+_checkSumFilesDeployed);
+ }
if ( t != null && _exception == null )
{
_exception = ( t instanceof HttpClientException ? (HttpClientException) t : new HttpClientException( _binding, t ) );
@@ -190,7 +199,7 @@
{
deployNextChecksumFile();
}
- else if ( _targetState.isReady() && _checksumState.isReady() )
+ else if ( _targetState.isReady() && (_checksumState.isReady()))
{
onComplete();
}
Modified: maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/FilePutExchange.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/FilePutExchange.java?rev=696893&r1=696892&r2=696893&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/FilePutExchange.java (original)
+++ maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/FilePutExchange.java Thu Sep 18 18:29:22 2008
@@ -90,6 +90,10 @@
for (StreamObserver o: _observers)
o.setLength(_localFile.length());
}
+
+ if (log.isDebugEnabled())
+ log.debug("PUT: "+getURI());
+
setRequestContentSource( getInputStream() );
setRequestHeader( __BATCH_HEADER, _batchId );
super.send();