[jboss-svn-commits] JBL Code SVN: r20552 - labs/jbossesb/branches/JBESB_4_2_1_GA_FP/product/rosetta/src/org/jboss/internal/soa/esb/util.

[jboss-svn-commits at lists.jboss.org]

Author: kevin.conner at jboss.com
Date: 2008-06-17 06:10:35 -0400 (Tue, 17 Jun 2008)
New Revision: 20552

Modified:
   labs/jbossesb/branches/JBESB_4_2_1_GA_FP/product/rosetta/src/org/jboss/internal/soa/esb/util/FtpImpl.java
   labs/jbossesb/branches/JBESB_4_2_1_GA_FP/product/rosetta/src/org/jboss/internal/soa/esb/util/FtpsImpl.java
Log:
Fix stream processing: JBESB-1816

Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_FP/product/rosetta/src/org/jboss/internal/soa/esb/util/FtpImpl.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_FP/product/rosetta/src/org/jboss/internal/soa/esb/util/FtpImpl.java	2008-06-17 07:45:03 UTC (rev 20551)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_FP/product/rosetta/src/org/jboss/internal/soa/esb/util/FtpImpl.java	2008-06-17 10:10:35 UTC (rev 20552)
@@ -569,6 +569,11 @@
                 final String sRemoteTmp = p_sRemoteName + TMP_SUFFIX;
                 
                 final OutputStream os = m_oConn.storeFileStream(sRemoteTmp) ;
+                if (os == null)
+                {
+                    throw new RemoteFileSystemException("Failed to obtain output stream: " + m_oConn.getReplyString()) ;
+                }
+                
                 try
                 {
                     final FileInputStream fis = new FileInputStream(p_oFile) ;

Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_FP/product/rosetta/src/org/jboss/internal/soa/esb/util/FtpsImpl.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_FP/product/rosetta/src/org/jboss/internal/soa/esb/util/FtpsImpl.java	2008-06-17 07:45:03 UTC (rev 20551)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_FP/product/rosetta/src/org/jboss/internal/soa/esb/util/FtpsImpl.java	2008-06-17 10:10:35 UTC (rev 20552)
@@ -237,24 +237,24 @@
                         final BufferedInputStream bis = new BufferedInputStream(is) ;
                         final DataInputStream dis = new DataInputStream(bis) ;
                         
-                        if (bis.available() > 0)
+                        if (dis.available() > 0)
                         {
                             // We have to skip any preamble to read the certificate
                             do
                             {
-                                bis.mark(BEGIN_CERTIFICATE.length() * 2) ;
+                                dis.mark(BEGIN_CERTIFICATE.length() * 2) ;
                                 final String line = dis.readLine() ;
                                 if (BEGIN_CERTIFICATE.equals(line))
                                 {
-                                    bis.reset() ;
+                                    dis.reset() ;
                                     break ;
                                 }
                             }
-                            while (bis.available() > 0) ;
+                            while (dis.available() > 0) ;
                             
-                            if (bis.available() > 0)
+                            if (dis.available() > 0)
                             {
-                                final X509Certificate cert = (X509Certificate)cf.generateCertificate(bis);
+                                final X509Certificate cert = (X509Certificate)cf.generateCertificate(dis);
                                 certificates.add(cert) ;
                             }
                         }