svn commit: r1508538 - in /webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/attachments: PartContentOnFile.java lifecycle/impl/FileAccessor.java

[ve...@apache.org]

Author: veithen
Date: Tue Jul 30 17:29:19 2013
New Revision: 1508538

URL: http://svn.apache.org/r1508538
Log:
AXIOM-418: Removed MessagingException from the methods in the FileAccessor API. Note that in some rare cases, this will break source code compatibility, but it will not break binary compatibility.

Modified:
    webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/attachments/PartContentOnFile.java
    webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/attachments/lifecycle/impl/FileAccessor.java

Modified: webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/attachments/PartContentOnFile.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/attachments/PartContentOnFile.java?rev=1508538&r1=1508537&r2=1508538&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/attachments/PartContentOnFile.java (original)
+++ webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/attachments/PartContentOnFile.java Tue Jul 30 17:29:19 2013
@@ -23,7 +23,6 @@ import org.apache.axiom.attachments.life
 import org.apache.axiom.attachments.lifecycle.impl.FileAccessor;
 
 import javax.activation.DataSource;
-import javax.mail.MessagingException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -66,15 +65,7 @@ class PartContentOnFile extends PartCont
     }
 
     InputStream getInputStream() throws IOException {
-        try {
-            return fileAccessor.getInputStream();
-        } catch (MessagingException ex) {
-            // The FileAccessor API uses MessagingException, although we no longer use javax.mail.
-            // Convert the exception to an IOException to keep the attachments API clean.
-            IOException ex2 = new IOException(ex.getMessage());
-            ex2.setStackTrace(ex.getStackTrace());
-            throw ex2;
-        }
+        return fileAccessor.getInputStream();
     }
     
     DataSource getDataSource(String contentType) {

Modified: webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/attachments/lifecycle/impl/FileAccessor.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/attachments/lifecycle/impl/FileAccessor.java?rev=1508538&r1=1508537&r2=1508538&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/attachments/lifecycle/impl/FileAccessor.java (original)
+++ webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/attachments/lifecycle/impl/FileAccessor.java Tue Jul 30 17:29:19 2013
@@ -29,7 +29,6 @@ import java.io.OutputStream;
 import java.util.Observable;
 
 import javax.activation.DataHandler;
-import javax.mail.MessagingException;
 
 import org.apache.axiom.attachments.CachedFileDataSource;
 import org.apache.axiom.attachments.lifecycle.LifecycleManager;
@@ -57,7 +56,7 @@ public class FileAccessor extends Observ
     /**
      * @deprecated This method is no longer used in Axiom 1.2.13 and will be removed in Axiom 1.3.
      */
-    public DataHandler getDataHandler(String contentType) throws MessagingException {
+    public DataHandler getDataHandler(String contentType) {
         if(log.isDebugEnabled()){
             log.debug("getDataHandler()");
             log.debug("accessCount =" +accessCount);
@@ -71,14 +70,14 @@ public class FileAccessor extends Observ
        	return new DataHandlerExtImpl(dataHandler, manager);        
     }
 
-    public String getFileName() throws MessagingException {
+    public String getFileName() {
         if(log.isDebugEnabled()){
             log.debug("getFileName()");
         }
         return file.getAbsolutePath();
     }
 
-    public InputStream getInputStream() throws IOException, MessagingException {
+    public InputStream getInputStream() throws IOException {
         if(log.isDebugEnabled()){
             log.debug("getInputStream()");
         }