maven-wagon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject cvs commit: maven-wagon/wagon-providers/ssh/src/main/java/org/apache/maven/wagon/providers/ssh ScpWagon.java
Date Fri, 25 Jun 2004 18:43:27 GMT
brett       2004/06/25 11:43:27

  Modified:    wagon-providers/ssh/src/main/java/org/apache/maven/wagon/providers/ssh
                        ScpWagon.java
  Log:
  fix mangled commit
  
  Revision  Changes    Path
  1.10      +0 -19     maven-wagon/wagon-providers/ssh/src/main/java/org/apache/maven/wagon/providers/ssh/ScpWagon.java
  
  Index: ScpWagon.java
  ===================================================================
  RCS file: /home/cvs/maven-wagon/wagon-providers/ssh/src/main/java/org/apache/maven/wagon/providers/ssh/ScpWagon.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ScpWagon.java	25 Jun 2004 18:41:31 -0000	1.9
  +++ ScpWagon.java	25 Jun 2004 18:43:27 -0000	1.10
  @@ -283,27 +283,9 @@
                   throw new TransferFailedException( msg );
               }
   
  -            byte[] buf = new byte[1024];
  -
               // send a content of lfile
               FileInputStream fis = new FileInputStream( source );
   
  -<<<<<<< ScpWagon.java
  -            try
  -            {
  -                while ( true )
  -                {
  -                    int len = fis.read( buf, 0, buf.length );
  -                    if ( len <= 0 ) break;
  -                    out.write( buf, 0, len );
  -                    out.flush();
  -                }
  -            }
  -            finally
  -            {
  -                fis.close();
  -            }
  -=======
               putTransfer( resource, source, fis,  out, false );
   
               byte[] buf = new byte[1024];
  @@ -318,7 +300,6 @@
   //
   //                out.flush();
   //            }
  ->>>>>>> 1.8
   
               // send '\0'
               buf[0] = 0;
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: wagon-cvs-unsubscribe@maven.apache.org
For additional commands, e-mail: wagon-cvs-help@maven.apache.org


Mime
View raw message