1 files changed, 2 insertions, 1 deletions
diff --git a/javax/activation/DataHandler.java b/javax/activation/DataHandler.java
index 2ef894976..de786f968 100644
--- a/javax/activation/DataHandler.java
+++ b/javax/activation/DataHandler.java
@@ -60,7 +60,7 @@ public class DataHandler
   private static final DataFlavor[] NO_FLAVORS = new DataFlavor[0];
   private static DataContentHandlerFactory factory = null;
   
-  private DataSource dataSource;
+  private final DataSource dataSource;
   private DataSource objDataSource;
   private Object object;
   private String objectMimeType;
@@ -88,6 +88,7 @@ public class DataHandler
    */
   public DataHandler(Object obj, String mimeType)
   {
+    dataSource = null;
     object = obj;
     objectMimeType = mimeType;
     oldFactory = factory;