Author: ogusakov
Date: Fri Aug 1 16:53:53 2008
New Revision: 681907
URL: http://svn.apache.org/viewvc?rev=681907&view=rev
Log:
enhanced http deployer diagnostics, all test pass
Modified:
maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DeploymentTarget.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=681907&r1=681906&r2=681907&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
Fri Aug 1 16:53:53 2008
@@ -139,11 +139,18 @@
_observers.add(o);
}
- if ( _binding == null ||
- (_binding.isFile() && (_binding.getLocalFile() == null ||
!_binding.getLocalFile().exists())) ||
- (_binding.isInMemory() && _binding.getLocalInputStream() ==
null))
+ if ( _binding == null )
{
- throw new IllegalArgumentException( "Nothing to deploy" );
+ throw new IllegalArgumentException( "Nothing to deploy - null
binding" );
+ }
+
+ if ( _binding.isFile() && (_binding.getLocalFile() == null ||
!_binding.getLocalFile().exists()) )
+ {
+ throw new IllegalArgumentException( "Nothing to deploy - local
file not found: " + _binding.getLocalFile() );
+ }
+ if( _binding.isInMemory() && _binding.getLocalInputStream() == null )
+ {
+ throw new IllegalArgumentException( "Nothing to deploy - inMemory
binding with null stream" );
}
_targetState = new TargetState();
_checksumState = new TargetState();