--- old/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeMultipart.java	2015-10-16 12:58:13.000000000 +0200
+++ new/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeMultipart.java	2015-10-16 12:58:12.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -93,7 +93,7 @@
     /**
      * Vector of MimeBodyPart objects.
      */
-    protected FinalArrayList parts = new FinalArrayList(); // Holds BodyParts
+    protected FinalArrayList<MimeBodyPart> parts = new FinalArrayList<MimeBodyPart>(); // Holds BodyParts
 
     /**
      * This field specifies the content-type of this multipart
@@ -212,7 +212,7 @@
         if (parts == null)
             throw new IndexOutOfBoundsException("No such BodyPart");
 
-        return (MimeBodyPart)parts.get(index);
+        return parts.get(index);
     }
 
     /**
@@ -259,7 +259,7 @@
      */
     protected void updateHeaders() throws MessagingException {
         for (int i = 0; i < parts.size(); i++)
-            ((MimeBodyPart)parts.get(i)).updateHeaders();
+            parts.get(i).updateHeaders();
     }
 
     /**
@@ -596,7 +596,7 @@
         if (parts == null)
             throw new IndexOutOfBoundsException("No such BodyPart");
 
-        MimeBodyPart part = (MimeBodyPart)parts.get(index);
+        MimeBodyPart part = parts.get(index);
         parts.remove(index);
         part.setParent(null);
     }
@@ -609,7 +609,7 @@
      */
     public synchronized void addBodyPart(MimeBodyPart part) {
         if (parts == null)
-            parts = new FinalArrayList();
+            parts = new FinalArrayList<MimeBodyPart>();
 
         parts.add(part);
         part.setParent(this);
@@ -627,7 +627,7 @@
      */
     public synchronized void addBodyPart(MimeBodyPart part, int index) {
         if (parts == null)
-            parts = new FinalArrayList();
+            parts = new FinalArrayList<MimeBodyPart>();
 
         parts.add(index,part);
         part.setParent(this);